Module: xenomai-forge
Branch: master
Commit: d93c065c6c5cc13496eeef9aa7c14c80daec47c2
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=d93c065c6c5cc13496eeef9aa7c14c80daec47c2
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu Jul 4 10:26:30 2013 +0200
include: fixup irregular headers
---
include/cobalt/asm-arm/calibration.h | 5 +-
include/cobalt/asm-arm/features.h | 4 +
include/cobalt/asm-arm/fptest.h | 18 ++++
include/cobalt/asm-arm/machine.h | 1 -
include/cobalt/asm-arm/syscall.h | 4 +
include/cobalt/asm-arm/thread.h | 5 +-
include/cobalt/asm-arm/uapi/tsc.h | 1 -
include/cobalt/asm-arm/wrappers.h | 1 -
include/cobalt/asm-blackfin/calibration.h | 5 +-
include/cobalt/asm-blackfin/features.h | 4 +
include/cobalt/asm-blackfin/fptest.h | 18 ++++
include/cobalt/asm-blackfin/machine.h | 5 +-
include/cobalt/asm-blackfin/syscall.h | 5 +-
include/cobalt/asm-blackfin/thread.h | 5 +-
include/cobalt/asm-blackfin/uapi/arith.h | 24 +++---
include/cobalt/asm-blackfin/wrappers.h | 1 -
include/cobalt/asm-generic/ipipe/thread_info.h | 2 +-
include/cobalt/asm-generic/machine.h | 3 +-
include/cobalt/asm-generic/mayday.h | 5 +-
include/cobalt/asm-generic/pci_ids.h | 18 ++++
include/cobalt/asm-generic/syscall.h | 5 +-
include/cobalt/asm-generic/thread.h | 1 -
include/cobalt/asm-generic/wrappers.h | 3 -
include/cobalt/asm-nios2/calibration.h | 5 +-
include/cobalt/asm-nios2/features.h | 4 +
include/cobalt/asm-nios2/fptest.h | 18 ++++
include/cobalt/asm-nios2/machine.h | 1 -
include/cobalt/asm-nios2/syscall.h | 5 +-
include/cobalt/asm-nios2/thread.h | 5 +-
include/cobalt/asm-nios2/uapi/arith.h | 24 +++---
include/cobalt/asm-nios2/wrappers.h | 1 -
include/cobalt/asm-powerpc/calibration.h | 5 +-
include/cobalt/asm-powerpc/features.h | 4 +
include/cobalt/asm-powerpc/fptest.h | 18 ++++
include/cobalt/asm-powerpc/machine.h | 9 +-
include/cobalt/asm-powerpc/syscall.h | 5 +-
include/cobalt/asm-powerpc/thread.h | 5 +-
include/cobalt/asm-powerpc/uapi/features.h | 1 -
include/cobalt/asm-powerpc/wrappers.h | 1 -
include/cobalt/asm-sh/calibration.h | 7 +-
include/cobalt/asm-sh/features.h | 4 +
include/cobalt/asm-sh/fptest.h | 18 ++++
include/cobalt/asm-sh/machine.h | 1 -
include/cobalt/asm-sh/switch.h | 105 ------------------------
include/cobalt/asm-sh/syscall.h | 4 +
include/cobalt/asm-sh/thread.h | 5 +-
include/cobalt/asm-sh/uapi/arith.h | 23 +++---
include/cobalt/asm-sh/uapi/features.h | 1 -
include/cobalt/asm-sh/wrappers.h | 1 -
include/cobalt/asm-x86/calibration.h | 5 +-
include/cobalt/asm-x86/features.h | 4 +
include/cobalt/asm-x86/fptest.h | 18 ++++
include/cobalt/asm-x86/machine.h | 1 -
include/cobalt/asm-x86/smi.h | 3 +-
include/cobalt/asm-x86/switch.h | 5 -
include/cobalt/asm-x86/syscall.h | 4 +
include/cobalt/asm-x86/thread.h | 5 +-
include/cobalt/asm-x86/uapi/arith.h | 27 +++----
include/cobalt/asm-x86/wrappers.h | 1 -
include/cobalt/kernel/arith.h | 2 +-
include/cobalt/kernel/registry.h | 2 +-
include/cobalt/kernel/vfile.h | 2 +-
include/cobalt/uapi/rtdm/syscall.h | 22 +++---
include/rtdm/rtipc.h | 2 +-
include/version.h | 24 +++---
65 files changed, 313 insertions(+), 237 deletions(-)
diff --git a/include/cobalt/asm-arm/calibration.h
b/include/cobalt/asm-arm/calibration.h
index 121ebf4..78a4331 100644
--- a/include/cobalt/asm-arm/calibration.h
+++ b/include/cobalt/asm-arm/calibration.h
@@ -19,10 +19,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_ARM_CALIBRATION_H
#define _COBALT_ASM_ARM_CALIBRATION_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
extern unsigned omap_rev(void);
#define cpu_is_omap44xx() ((omap_rev() & 0xff) == 0x44)
diff --git a/include/cobalt/asm-arm/features.h
b/include/cobalt/asm-arm/features.h
index 127f927..da6fc64 100644
--- a/include/cobalt/asm-arm/features.h
+++ b/include/cobalt/asm-arm/features.h
@@ -22,6 +22,10 @@
#ifndef _COBALT_ASM_ARM_FEATURES_H
#define _COBALT_ASM_ARM_FEATURES_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#ifdef CONFIG_AEABI
#define CONFIG_XENO_ARM_EABI 1
#endif
diff --git a/include/cobalt/asm-arm/fptest.h b/include/cobalt/asm-arm/fptest.h
index c9a9345..9bc4ced 100644
--- a/include/cobalt/asm-arm/fptest.h
+++ b/include/cobalt/asm-arm/fptest.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_ARM_FPTEST_H
#define _COBALT_ASM_ARM_FPTEST_H
diff --git a/include/cobalt/asm-arm/machine.h b/include/cobalt/asm-arm/machine.h
index 8e5e31c..aea57b6 100644
--- a/include/cobalt/asm-arm/machine.h
+++ b/include/cobalt/asm-arm/machine.h
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_ARM_MACHINE_H
#define _COBALT_ASM_ARM_MACHINE_H
diff --git a/include/cobalt/asm-arm/syscall.h b/include/cobalt/asm-arm/syscall.h
index 4254245..8a47df4 100644
--- a/include/cobalt/asm-arm/syscall.h
+++ b/include/cobalt/asm-arm/syscall.h
@@ -22,6 +22,10 @@
#ifndef _COBALT_ASM_ARM_SYSCALL_H
#define _COBALT_ASM_ARM_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/errno.h>
#include <asm/uaccess.h>
#include <asm/ptrace.h>
diff --git a/include/cobalt/asm-arm/thread.h b/include/cobalt/asm-arm/thread.h
index c2c411b..f2da91d 100644
--- a/include/cobalt/asm-arm/thread.h
+++ b/include/cobalt/asm-arm/thread.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_ARM_THREAD_H
#define _COBALT_ASM_ARM_THREAD_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm-generic/xenomai/thread.h>
#ifdef CONFIG_XENO_HW_FPU
diff --git a/include/cobalt/asm-arm/uapi/tsc.h
b/include/cobalt/asm-arm/uapi/tsc.h
index a4690ee..be6a97e 100644
--- a/include/cobalt/asm-arm/uapi/tsc.h
+++ b/include/cobalt/asm-arm/uapi/tsc.h
@@ -15,7 +15,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
#ifndef _COBALT_ASM_ARM_UAPI_TSC_H
#define _COBALT_ASM_ARM_UAPI_TSC_H
diff --git a/include/cobalt/asm-arm/wrappers.h
b/include/cobalt/asm-arm/wrappers.h
index 37ceb61..a6bc570 100644
--- a/include/cobalt/asm-arm/wrappers.h
+++ b/include/cobalt/asm-arm/wrappers.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_ARM_WRAPPERS_H
#define _COBALT_ASM_ARM_WRAPPERS_H
diff --git a/include/cobalt/asm-blackfin/calibration.h
b/include/cobalt/asm-blackfin/calibration.h
index 6167ad5..8761961 100644
--- a/include/cobalt/asm-blackfin/calibration.h
+++ b/include/cobalt/asm-blackfin/calibration.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_BLACKFIN_CALIBRATION_H
#define _COBALT_ASM_BLACKFIN_CALIBRATION_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
static inline unsigned long xnarch_get_sched_latency (void)
{
diff --git a/include/cobalt/asm-blackfin/features.h
b/include/cobalt/asm-blackfin/features.h
index 8bcdda1..a90f88a 100644
--- a/include/cobalt/asm-blackfin/features.h
+++ b/include/cobalt/asm-blackfin/features.h
@@ -19,6 +19,10 @@
#ifndef _COBALT_ASM_BLACKFIN_FEATURES_H
#define _COBALT_ASM_BLACKFIN_FEATURES_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
struct xnfeatinfo;
static inline void collect_arch_features(struct xnfeatinfo *p) { }
diff --git a/include/cobalt/asm-blackfin/fptest.h
b/include/cobalt/asm-blackfin/fptest.h
index 0354f62..4bc0c9c 100644
--- a/include/cobalt/asm-blackfin/fptest.h
+++ b/include/cobalt/asm-blackfin/fptest.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_BLACKFIN_FPTEST_H
#define _COBALT_ASM_BLACKFIN_FPTEST_H
diff --git a/include/cobalt/asm-blackfin/machine.h
b/include/cobalt/asm-blackfin/machine.h
index b64b262..ff321e2 100644
--- a/include/cobalt/asm-blackfin/machine.h
+++ b/include/cobalt/asm-blackfin/machine.h
@@ -17,10 +17,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_BLACKFIN_MACHINE_H
#define _COBALT_ASM_BLACKFIN_MACHINE_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/compiler.h>
#include <linux/linkage.h>
#include <linux/bitops.h>
diff --git a/include/cobalt/asm-blackfin/syscall.h
b/include/cobalt/asm-blackfin/syscall.h
index 8ab1be7..41d62c9 100644
--- a/include/cobalt/asm-blackfin/syscall.h
+++ b/include/cobalt/asm-blackfin/syscall.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_BLACKFIN_SYSCALL_H
#define _COBALT_ASM_BLACKFIN_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm-generic/xenomai/syscall.h>
diff --git a/include/cobalt/asm-blackfin/thread.h
b/include/cobalt/asm-blackfin/thread.h
index b65a67d..ed11eed 100644
--- a/include/cobalt/asm-blackfin/thread.h
+++ b/include/cobalt/asm-blackfin/thread.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_BLACKFIN_THREAD_H
#define _COBALT_ASM_BLACKFIN_THREAD_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm-generic/xenomai/thread.h>
struct xnarchtcb {
diff --git a/include/cobalt/asm-blackfin/uapi/arith.h
b/include/cobalt/asm-blackfin/uapi/arith.h
index 425b295..c57fb6b 100644
--- a/include/cobalt/asm-blackfin/uapi/arith.h
+++ b/include/cobalt/asm-blackfin/uapi/arith.h
@@ -1,22 +1,20 @@
/*
* Copyright (C) 2008 Philippe Gerum <r...@xenomai.org>.
*
- * Xenomai is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
#ifndef _COBALT_ASM_BLACKFIN_UAPI_ARITH_H
#define _COBALT_ASM_BLACKFIN_UAPI_ARITH_H
diff --git a/include/cobalt/asm-blackfin/wrappers.h
b/include/cobalt/asm-blackfin/wrappers.h
index 368a9cc..5acdeae 100644
--- a/include/cobalt/asm-blackfin/wrappers.h
+++ b/include/cobalt/asm-blackfin/wrappers.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_BLACKFIN_WRAPPERS_H
#define _COBALT_ASM_BLACKFIN_WRAPPERS_H
diff --git a/include/cobalt/asm-generic/ipipe/thread_info.h
b/include/cobalt/asm-generic/ipipe/thread_info.h
index ba563d6..c0c8462 100644
--- a/include/cobalt/asm-generic/ipipe/thread_info.h
+++ b/include/cobalt/asm-generic/ipipe/thread_info.h
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2012 Philippe Gerum <r...@xenomai.org>.
*
- * This program is free software; you can redistribute it and/or modify
+ * Xenomai is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
* USA; either version 2 of the License, or (at your option) any later
diff --git a/include/cobalt/asm-generic/machine.h
b/include/cobalt/asm-generic/machine.h
index ee3dcb6..a32e63c 100644
--- a/include/cobalt/asm-generic/machine.h
+++ b/include/cobalt/asm-generic/machine.h
@@ -1,7 +1,7 @@
/**
* Copyright © 2012 Philippe Gerum.
*
- * This program is free software; you can redistribute it and/or modify
+ * Xenomai is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
* USA; either version 2 of the License, or (at your option) any later
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_GENERIC_MACHINE_H
#define _COBALT_ASM_GENERIC_MACHINE_H
diff --git a/include/cobalt/asm-generic/mayday.h
b/include/cobalt/asm-generic/mayday.h
index dc67bc8..4dd7f6a 100644
--- a/include/cobalt/asm-generic/mayday.h
+++ b/include/cobalt/asm-generic/mayday.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_GENERIC_MAYDAY_H
#define _COBALT_ASM_GENERIC_MAYDAY_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
struct task_struct;
struct pt_regs;
diff --git a/include/cobalt/asm-generic/pci_ids.h
b/include/cobalt/asm-generic/pci_ids.h
index 8cefd42..1a6c308 100644
--- a/include/cobalt/asm-generic/pci_ids.h
+++ b/include/cobalt/asm-generic/pci_ids.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2009 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_GENERIC_PCI_IDS_H
#define _COBALT_ASM_GENERIC_PCI_IDS_H
diff --git a/include/cobalt/asm-generic/syscall.h
b/include/cobalt/asm-generic/syscall.h
index 7e2818c..5a84c0c 100644
--- a/include/cobalt/asm-generic/syscall.h
+++ b/include/cobalt/asm-generic/syscall.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_GENERIC_SYSCALL_H
#define _COBALT_ASM_GENERIC_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/types.h>
#include <asm/uaccess.h>
#include <asm/xenomai/features.h>
diff --git a/include/cobalt/asm-generic/thread.h
b/include/cobalt/asm-generic/thread.h
index 2a6243b..e1c1e8b 100644
--- a/include/cobalt/asm-generic/thread.h
+++ b/include/cobalt/asm-generic/thread.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_GENERIC_THREAD_H
#define _COBALT_ASM_GENERIC_THREAD_H
diff --git a/include/cobalt/asm-generic/wrappers.h
b/include/cobalt/asm-generic/wrappers.h
index 16bce2a..02eeed0 100644
--- a/include/cobalt/asm-generic/wrappers.h
+++ b/include/cobalt/asm-generic/wrappers.h
@@ -15,10 +15,7 @@
* along with Xenomai; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
- *
- * Generic wrappers.
*/
-
#ifndef _COBALT_ASM_GENERIC_WRAPPERS_H
#ifndef __KERNEL__
diff --git a/include/cobalt/asm-nios2/calibration.h
b/include/cobalt/asm-nios2/calibration.h
index b9df74c..0b4a415 100644
--- a/include/cobalt/asm-nios2/calibration.h
+++ b/include/cobalt/asm-nios2/calibration.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_NIOS2_CALIBRATION_H
#define _COBALT_ASM_NIOS2_CALIBRATION_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
static inline unsigned long xnarch_get_sched_latency (void)
{
#if CONFIG_XENO_OPT_TIMING_SCHEDLAT != 0
diff --git a/include/cobalt/asm-nios2/features.h
b/include/cobalt/asm-nios2/features.h
index 5d7a69d..7d42fbb 100644
--- a/include/cobalt/asm-nios2/features.h
+++ b/include/cobalt/asm-nios2/features.h
@@ -19,6 +19,10 @@
#ifndef _COBALT_ASM_NIOS2_FEATURES_H
#define _COBALT_ASM_NIOS2_FEATURES_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/ipipe.h>
#include <asm/xenomai/uapi/features.h>
diff --git a/include/cobalt/asm-nios2/fptest.h
b/include/cobalt/asm-nios2/fptest.h
index af50fb4..68f19e0 100644
--- a/include/cobalt/asm-nios2/fptest.h
+++ b/include/cobalt/asm-nios2/fptest.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_NIOS2_FPTEST_H
#define _COBALT_ASM_NIOS2_FPTEST_H
diff --git a/include/cobalt/asm-nios2/machine.h
b/include/cobalt/asm-nios2/machine.h
index 84e3614..9127d5b 100644
--- a/include/cobalt/asm-nios2/machine.h
+++ b/include/cobalt/asm-nios2/machine.h
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_NIOS2_MACHINE_H
#define _COBALT_ASM_NIOS2_MACHINE_H
diff --git a/include/cobalt/asm-nios2/syscall.h
b/include/cobalt/asm-nios2/syscall.h
index 52b994d..a5a2909 100644
--- a/include/cobalt/asm-nios2/syscall.h
+++ b/include/cobalt/asm-nios2/syscall.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_NIOS2_SYSCALL_H
#define _COBALT_ASM_NIOS2_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/errno.h>
#include <asm/uaccess.h>
#include <asm/ptrace.h>
diff --git a/include/cobalt/asm-nios2/thread.h
b/include/cobalt/asm-nios2/thread.h
index 1dc8ae7..e06f7b4 100644
--- a/include/cobalt/asm-nios2/thread.h
+++ b/include/cobalt/asm-nios2/thread.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_NIOS2_THREAD_H
#define _COBALT_ASM_NIOS2_THREAD_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm-generic/xenomai/thread.h>
#ifndef CONFIG_MMU
diff --git a/include/cobalt/asm-nios2/uapi/arith.h
b/include/cobalt/asm-nios2/uapi/arith.h
index 804224d..1c1a062 100644
--- a/include/cobalt/asm-nios2/uapi/arith.h
+++ b/include/cobalt/asm-nios2/uapi/arith.h
@@ -1,22 +1,20 @@
/*
* Copyright (C) 2009 Philippe Gerum <r...@xenomai.org>.
*
- * Xenomai is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
#ifndef _COBALT_ASM_NIOS2_UAPI_ARITH_H
#define _COBALT_ASM_NIOS2_UAPI_ARITH_H
diff --git a/include/cobalt/asm-nios2/wrappers.h
b/include/cobalt/asm-nios2/wrappers.h
index a3b8006..e6d78cb 100644
--- a/include/cobalt/asm-nios2/wrappers.h
+++ b/include/cobalt/asm-nios2/wrappers.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_NIOS2_WRAPPERS_H
#define _COBALT_ASM_NIOS2_WRAPPERS_H
diff --git a/include/cobalt/asm-powerpc/calibration.h
b/include/cobalt/asm-powerpc/calibration.h
index 35ffcc4..37523b4 100644
--- a/include/cobalt/asm-powerpc/calibration.h
+++ b/include/cobalt/asm-powerpc/calibration.h
@@ -19,10 +19,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_POWERPC_CALIBRATION_H
#define _COBALT_ASM_POWERPC_CALIBRATION_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
static inline unsigned long xnarch_get_sched_latency(void)
{
#if CONFIG_XENO_OPT_TIMING_SCHEDLAT != 0
diff --git a/include/cobalt/asm-powerpc/features.h
b/include/cobalt/asm-powerpc/features.h
index 042149f..11b8792 100644
--- a/include/cobalt/asm-powerpc/features.h
+++ b/include/cobalt/asm-powerpc/features.h
@@ -19,6 +19,10 @@
#ifndef _COBALT_ASM_POWERPC_FEATURES_H
#define _COBALT_ASM_POWERPC_FEATURES_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
struct xnfeatinfo;
static inline void collect_arch_features(struct xnfeatinfo *p) { }
diff --git a/include/cobalt/asm-powerpc/fptest.h
b/include/cobalt/asm-powerpc/fptest.h
index 43eda40..a7d5fdd 100644
--- a/include/cobalt/asm-powerpc/fptest.h
+++ b/include/cobalt/asm-powerpc/fptest.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_POWERPC_FPTEST_H
#define _COBALT_ASM_POWERPC_FPTEST_H
diff --git a/include/cobalt/asm-powerpc/machine.h
b/include/cobalt/asm-powerpc/machine.h
index e476098..0be2253 100644
--- a/include/cobalt/asm-powerpc/machine.h
+++ b/include/cobalt/asm-powerpc/machine.h
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_POWERPC_MACHINE_H
#define _COBALT_ASM_POWERPC_MACHINE_H
@@ -35,11 +34,11 @@
static inline __attribute_const__ unsigned long ffnz(unsigned long ul)
{
#ifdef CONFIG_PPC64
- __asm__ ("cntlzd %0, %1" : "=r" (ul) : "r" (ul & (-ul)));
- return 63 - ul;
+ __asm__ ("cntlzd %0, %1" : "=r" (ul) : "r" (ul & (-ul)));
+ return 63 - ul;
#else
- __asm__ ("cntlzw %0, %1":"=r"(ul):"r"(ul & (-ul)));
- return 31 - ul;
+ __asm__ ("cntlzw %0, %1":"=r"(ul):"r"(ul & (-ul)));
+ return 31 - ul;
#endif
}
diff --git a/include/cobalt/asm-powerpc/syscall.h
b/include/cobalt/asm-powerpc/syscall.h
index 53e872d..39226de 100644
--- a/include/cobalt/asm-powerpc/syscall.h
+++ b/include/cobalt/asm-powerpc/syscall.h
@@ -19,10 +19,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_POWERPC_SYSCALL_H
#define _COBALT_ASM_POWERPC_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm-generic/xenomai/syscall.h>
diff --git a/include/cobalt/asm-powerpc/thread.h
b/include/cobalt/asm-powerpc/thread.h
index e77cb3f..b696fc1 100644
--- a/include/cobalt/asm-powerpc/thread.h
+++ b/include/cobalt/asm-powerpc/thread.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_POWERPC_THREAD_H
#define _COBALT_ASM_POWERPC_THREAD_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm-generic/xenomai/thread.h>
struct xnarchtcb {
diff --git a/include/cobalt/asm-powerpc/uapi/features.h
b/include/cobalt/asm-powerpc/uapi/features.h
index 266bd25..173830f 100644
--- a/include/cobalt/asm-powerpc/uapi/features.h
+++ b/include/cobalt/asm-powerpc/uapi/features.h
@@ -15,7 +15,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
#ifndef _COBALT_ASM_POWERPC_UAPI_FEATURES_H
#define _COBALT_ASM_POWERPC_UAPI_FEATURES_H
diff --git a/include/cobalt/asm-powerpc/wrappers.h
b/include/cobalt/asm-powerpc/wrappers.h
index 61727ac..24d5393 100644
--- a/include/cobalt/asm-powerpc/wrappers.h
+++ b/include/cobalt/asm-powerpc/wrappers.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_POWERPC_WRAPPERS_H
#define _COBALT_ASM_POWERPC_WRAPPERS_H
diff --git a/include/cobalt/asm-sh/calibration.h
b/include/cobalt/asm-sh/calibration.h
index da9e993..9287c1e 100644
--- a/include/cobalt/asm-sh/calibration.h
+++ b/include/cobalt/asm-sh/calibration.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_SH_CALIBRATION_H
#define _COBALT_ASM_SH_CALIBRATION_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
static inline unsigned long xnarch_get_sched_latency (void)
{
#if CONFIG_XENO_OPT_TIMING_SCHEDLAT != 0
@@ -32,7 +35,7 @@ static inline unsigned long xnarch_get_sched_latency (void)
#endif
#endif /* CONFIG_XENO_OPT_TIMING_SCHEDLAT */
- return __sched_latency;
+ return __sched_latency;
}
#undef __sched_latency
diff --git a/include/cobalt/asm-sh/features.h b/include/cobalt/asm-sh/features.h
index 7395279..4f25bcc 100644
--- a/include/cobalt/asm-sh/features.h
+++ b/include/cobalt/asm-sh/features.h
@@ -19,6 +19,10 @@
#ifndef _COBALT_ASM_SH_FEATURES_H
#define _COBALT_ASM_SH_FEATURES_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/ipipe.h>
#include <asm/xenomai/uapi/features.h>
diff --git a/include/cobalt/asm-sh/fptest.h b/include/cobalt/asm-sh/fptest.h
index 867f3b9..0a5aef8 100644
--- a/include/cobalt/asm-sh/fptest.h
+++ b/include/cobalt/asm-sh/fptest.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_SH_FPTEST_H
#define _COBALT_ASM_SH_FPTEST_H
diff --git a/include/cobalt/asm-sh/machine.h b/include/cobalt/asm-sh/machine.h
index e753ef0..cc67bfa 100644
--- a/include/cobalt/asm-sh/machine.h
+++ b/include/cobalt/asm-sh/machine.h
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_SH_MACHINE_H
#define _COBALT_ASM_SH_MACHINE_H
diff --git a/include/cobalt/asm-sh/switch.h b/include/cobalt/asm-sh/switch.h
deleted file mode 100644
index 455b45a..0000000
--- a/include/cobalt/asm-sh/switch.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011 Philippe Gerum <r...@xenomai.org>.
- *
- * Xenomai is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _COBALT_ASM_SH_SWITCH_H
-#define _COBALT_ASM_SH_SWITCH_H
-
-#ifndef __KERNEL__
-#error "Pure kernel header included from user-space!"
-#endif
-
-#include <asm/system.h>
-
-/*
- * Most of this code was lifted from the regular Linux task switching
- * code. A provision for handling Xenomai-originated kernel threads
- * (aka "hybrid scheduling" is added).
- */
-#define xnarch_switch_threads(otcb, itcb, prev, next) \
- ({ \
- register u32 *__ts1 __asm__ ("r1"); \
- register u32 *__ts2 __asm__ ("r2"); \
- register u32 *__ts4 __asm__ ("r4"); \
- register u32 *__ts5 __asm__ ("r5"); \
- register u32 *__ts6 __asm__ ("r6"); \
- register u32 __ts7 __asm__ ("r7"); \
- struct task_struct *__last = prev; \
- struct xnarchtcb *__ltcb = otcb; \
- \
- if (otcb->tsp == &prev->thread && \
- is_dsp_enabled(prev)) \
- __save_dsp(prev); \
- \
- __ts1 = (u32 *)&otcb->tsp->sp; \
- __ts2 = (u32 *)&otcb->tsp->pc; \
- __ts4 = (u32 *)prev; \
- __ts5 = (u32 *)next; \
- __ts6 = (u32 *)&itcb->tsp->sp; \
- __ts7 = itcb->tsp->pc; \
- \
- __asm__ __volatile__ ( \
- ".balign 4\n\t" \
- "stc.l gbr, @-r15\n\t" \
- "sts.l pr, @-r15\n\t" \
- "mov.l r8, @-r15\n\t" \
- "mov.l r9, @-r15\n\t" \
- "mov.l r10, @-r15\n\t" \
- "mov.l r11, @-r15\n\t" \
- "mov.l r12, @-r15\n\t" \
- "mov.l r13, @-r15\n\t" \
- "mov.l r14, @-r15\n\t" \
- "mov.l r15, @r1\t! save SP\n\t" \
- "mov.l @r6, r15\t! change to new stack\n\t" \
- "mova 1f, %0\n\t" \
- "mov.l %0, @r2\t! save PC\n\t" \
- "mov #0, r8\n\t" \
- "cmp/eq r5, r8\n\t" \
- "bt/s 3f\n\t" \
- " lds r7, pr\t! return to saved PC\n\t" \
- "mov.l 2f, %0\n\t" \
- "jmp @%0\t! call __switch_to\n\t" \
- " nop\t\n\t" \
- "3:\n\t" \
- "rts\n\t" \
- ".balign 4\n" \
- "2:\n\t" \
- ".long __switch_to\n" \
- "1:\n\t" \
- "mov.l @r15+, r14\n\t" \
- "mov.l @r15+, r13\n\t" \
- "mov.l @r15+, r12\n\t" \
- "mov.l @r15+, r11\n\t" \
- "mov.l @r15+, r10\n\t" \
- "mov.l @r15+, r9\n\t" \
- "mov.l @r15+, r8\n\t" \
- "lds.l @r15+, pr\n\t" \
- "ldc.l @r15+, gbr\n\t" \
- : "=z" (__last) \
- : "r" (__ts1), "r" (__ts2), "r" (__ts4), \
- "r" (__ts5), "r" (__ts6), "r" (__ts7) \
- : "r3", "t"); \
- \
- if (__ltcb->tsp == &__last->thread && \
- is_dsp_enabled(__last)) \
- __restore_dsp(__last); \
- \
- __last; \
- })
-
-#endif /* _COBALT_ASM_SH_SWITCH_H */
diff --git a/include/cobalt/asm-sh/syscall.h b/include/cobalt/asm-sh/syscall.h
index 2edf2e9..83e9f2d 100644
--- a/include/cobalt/asm-sh/syscall.h
+++ b/include/cobalt/asm-sh/syscall.h
@@ -19,6 +19,10 @@
#ifndef _COBALT_ASM_SH_SYSCALL_H
#define _COBALT_ASM_SH_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm-generic/xenomai/syscall.h>
diff --git a/include/cobalt/asm-sh/thread.h b/include/cobalt/asm-sh/thread.h
index 6097f6e..1414674 100644
--- a/include/cobalt/asm-sh/thread.h
+++ b/include/cobalt/asm-sh/thread.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_SH_THREAD_H
#define _COBALT_ASM_SH_THREAD_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm-generic/xenomai/thread.h>
struct xnarchtcb {
diff --git a/include/cobalt/asm-sh/uapi/arith.h
b/include/cobalt/asm-sh/uapi/arith.h
index 3ef2222..522258d 100644
--- a/include/cobalt/asm-sh/uapi/arith.h
+++ b/include/cobalt/asm-sh/uapi/arith.h
@@ -1,20 +1,19 @@
/*
* Copyright (C) 2011 Philippe Gerum <r...@xenomai.org>.
*
- * Xenomai is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
#ifndef _COBALT_ASM_SH_UAPI_ARITH_H
#define _COBALT_ASM_SH_UAPI_ARITH_H
diff --git a/include/cobalt/asm-sh/uapi/features.h
b/include/cobalt/asm-sh/uapi/features.h
index d8d0fac..3a79f4b 100644
--- a/include/cobalt/asm-sh/uapi/features.h
+++ b/include/cobalt/asm-sh/uapi/features.h
@@ -15,7 +15,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
#ifndef _COBALT_ASM_SH_FEATURES_H
#define _COBALT_ASM_SH_FEATURES_H
diff --git a/include/cobalt/asm-sh/wrappers.h b/include/cobalt/asm-sh/wrappers.h
index fa04c36..4e65e02 100644
--- a/include/cobalt/asm-sh/wrappers.h
+++ b/include/cobalt/asm-sh/wrappers.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_SH_WRAPPERS_H
#define _COBALT_ASM_SH_WRAPPERS_H
diff --git a/include/cobalt/asm-x86/calibration.h
b/include/cobalt/asm-x86/calibration.h
index b641020..6484131 100644
--- a/include/cobalt/asm-x86/calibration.h
+++ b/include/cobalt/asm-x86/calibration.h
@@ -16,10 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_X86_CALIBRATION_H
#define _COBALT_ASM_X86_CALIBRATION_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm/processor.h>
static inline unsigned long xnarch_get_sched_latency (void)
diff --git a/include/cobalt/asm-x86/features.h
b/include/cobalt/asm-x86/features.h
index fa0f33a..3bae559 100644
--- a/include/cobalt/asm-x86/features.h
+++ b/include/cobalt/asm-x86/features.h
@@ -19,6 +19,10 @@
#ifndef _COBALT_ASM_X86_FEATURES_H
#define _COBALT_ASM_X86_FEATURES_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
struct xnfeatinfo;
static inline void collect_arch_features(struct xnfeatinfo *p) { }
diff --git a/include/cobalt/asm-x86/fptest.h b/include/cobalt/asm-x86/fptest.h
index 18c48b7..b4c9ce0 100644
--- a/include/cobalt/asm-x86/fptest.h
+++ b/include/cobalt/asm-x86/fptest.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>.
+ *
+ * Xenomai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * Xenomai is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xenomai; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#ifndef _COBALT_ASM_X86_FPTEST_H
#define _COBALT_ASM_X86_FPTEST_H
diff --git a/include/cobalt/asm-x86/machine.h b/include/cobalt/asm-x86/machine.h
index 76931c7..6431a89 100644
--- a/include/cobalt/asm-x86/machine.h
+++ b/include/cobalt/asm-x86/machine.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_X86_MACHINE_H
#define _COBALT_ASM_X86_MACHINE_H
diff --git a/include/cobalt/asm-x86/smi.h b/include/cobalt/asm-x86/smi.h
index 7c243be..4f88fbe 100644
--- a/include/cobalt/asm-x86/smi.h
+++ b/include/cobalt/asm-x86/smi.h
@@ -3,7 +3,7 @@
*
* SMI workaround for x86.
*
- * This program is free software; you can redistribute it and/or modify
+ * Xenomai free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
* USA; either version 2 of the License, or (at your option) any later
@@ -18,7 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_X86_SMI_H
#define _COBALT_ASM_X86_SMI_H
diff --git a/include/cobalt/asm-x86/switch.h b/include/cobalt/asm-x86/switch.h
deleted file mode 100644
index 017c809..0000000
--- a/include/cobalt/asm-x86/switch.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef __i386__
-#include "switch_32.h"
-#else
-#include "switch_64.h"
-#endif
diff --git a/include/cobalt/asm-x86/syscall.h b/include/cobalt/asm-x86/syscall.h
index b9f6602..d10d33d 100644
--- a/include/cobalt/asm-x86/syscall.h
+++ b/include/cobalt/asm-x86/syscall.h
@@ -20,6 +20,10 @@
#ifndef _COBALT_ASM_X86_SYSCALL_H
#define _COBALT_ASM_X86_SYSCALL_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm-generic/xenomai/syscall.h>
diff --git a/include/cobalt/asm-x86/thread.h b/include/cobalt/asm-x86/thread.h
index 608d0ad..44bf7b0 100644
--- a/include/cobalt/asm-x86/thread.h
+++ b/include/cobalt/asm-x86/thread.h
@@ -18,10 +18,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_X86_THREAD_H
#define _COBALT_ASM_X86_THREAD_H
+#ifndef __KERNEL__
+#error "Pure kernel header included from user-space!"
+#endif
+
#include <asm-generic/xenomai/thread.h>
#include <asm/xenomai/wrappers.h>
diff --git a/include/cobalt/asm-x86/uapi/arith.h
b/include/cobalt/asm-x86/uapi/arith.h
index af883a3..f03b823 100644
--- a/include/cobalt/asm-x86/uapi/arith.h
+++ b/include/cobalt/asm-x86/uapi/arith.h
@@ -4,23 +4,20 @@
* Copyright © 2005 Gilles Chanteperdrix, 32bit version.
* Copyright © 2007 Jan Kiszka, 64bit version.
*
- * Xenomai is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, Inc., 675 Mass Ave,
- * Cambridge MA 02139, USA; either version 2 of the License, or (at
- * your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * Xenomai is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
#ifndef _COBALT_ASM_X86_UAPI_ARITH_H
#define _COBALT_ASM_X86_UAPI_ARITH_H
#define _COBALT_ASM_X86_UAPI_ARITH_H
diff --git a/include/cobalt/asm-x86/wrappers.h
b/include/cobalt/asm-x86/wrappers.h
index 8cca36c..e1f5e05 100644
--- a/include/cobalt/asm-x86/wrappers.h
+++ b/include/cobalt/asm-x86/wrappers.h
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
#ifndef _COBALT_ASM_X86_WRAPPERS_H
#define _COBALT_ASM_X86_WRAPPERS_H
#define _COBALT_ASM_X86_WRAPPERS_H
diff --git a/include/cobalt/kernel/arith.h b/include/cobalt/kernel/arith.h
index 0ce9e91..9afe37e 100644
--- a/include/cobalt/kernel/arith.h
+++ b/include/cobalt/kernel/arith.h
@@ -3,7 +3,7 @@
* Copyright © 2005 Stelian Pop.
* Copyright © 2005 Gilles Chanteperdrix.
*
- * This program is free software; you can redistribute it and/or modify
+ * Xenomai is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
* USA; either version 2 of the License, or (at your option) any later
diff --git a/include/cobalt/kernel/registry.h b/include/cobalt/kernel/registry.h
index fd472ee..d2906db 100644
--- a/include/cobalt/kernel/registry.h
+++ b/include/cobalt/kernel/registry.h
@@ -4,7 +4,7 @@
*
* @note Copyright (C) 2004 Philippe Gerum <r...@xenomai.org>
*
- * This program is free software; you can redistribute it and/or
+ * Xenomai is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
diff --git a/include/cobalt/kernel/vfile.h b/include/cobalt/kernel/vfile.h
index 66a096a..97e6290 100644
--- a/include/cobalt/kernel/vfile.h
+++ b/include/cobalt/kernel/vfile.h
@@ -4,7 +4,7 @@
*
* @note Copyright (C) 2010 Philippe Gerum <r...@xenomai.org>
*
- * This program is free software; you can redistribute it and/or
+ * Xenomai is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
diff --git a/include/cobalt/uapi/rtdm/syscall.h
b/include/cobalt/uapi/rtdm/syscall.h
index 9f7c60a..d6e161b 100644
--- a/include/cobalt/uapi/rtdm/syscall.h
+++ b/include/cobalt/uapi/rtdm/syscall.h
@@ -2,19 +2,19 @@
* Copyright (C) 2005 Jan Kiszka <jan.kis...@web.de>.
* Copyright (C) 2005 Joerg Langenberg <joerg.langenb...@gmx.net>.
*
- * Xenomai is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
#ifndef _COBALT_UAPI_RTDM_SYSCALL_H
#define _COBALT_UAPI_RTDM_SYSCALL_H
diff --git a/include/rtdm/rtipc.h b/include/rtdm/rtipc.h
index e431dae..77a1475 100644
--- a/include/rtdm/rtipc.h
+++ b/include/rtdm/rtipc.h
@@ -4,7 +4,7 @@
*
* @note Copyright (C) 2009 Philippe Gerum <r...@xenomai.org>
*
- * This program is free software; you can redistribute it and/or
+ * Xenomai is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
diff --git a/include/version.h b/include/version.h
index 7657c62..4e6c32f 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,22 +1,20 @@
/*
* Copyright (C) 2001-2013 Philippe Gerum <r...@xenomai.org>.
*
- * Xenomai is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
#ifndef _XENOMAI_VERSION_H
#define _XENOMAI_VERSION_H
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
