Merge /spare/repo/linux-2.6/

5 files changed, 162 insertions, 14 deletions

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
new file mode 100644
index 000000000000..b663520dcdc4
--- /dev/null
+++ b/include/asm-generic/fcntl.h
@@ -0,0 +1,149 @@
+#ifndef _ASM_GENERIC_FCNTL_H
+#define _ASM_GENERIC_FCNTL_H
+
+#include <linux/config.h>
+#include <linux/types.h>
+
+/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
+   located on an ext2 file system */
+#define O_ACCMODE       00000003
+#define O_RDONLY        00000000
+#define O_WRONLY        00000001
+#define O_RDWR          00000002
+#ifndef O_CREAT
+#define O_CREAT         00000100        /* not fcntl */
+#endif
+#ifndef O_EXCL
+#define O_EXCL          00000200        /* not fcntl */
+#endif
+#ifndef O_NOCTTY
+#define O_NOCTTY        00000400        /* not fcntl */
+#endif
+#ifndef O_TRUNC
+#define O_TRUNC         00001000        /* not fcntl */
+#endif
+#ifndef O_APPEND
+#define O_APPEND        00002000
+#endif
+#ifndef O_NONBLOCK
+#define O_NONBLOCK      00004000
+#endif
+#ifndef O_SYNC
+#define O_SYNC          00010000
+#endif
+#ifndef FASYNC
+#define FASYNC          00020000        /* fcntl, for BSD compatibility */
+#endif
+#ifndef O_DIRECT
+#define O_DIRECT        00040000        /* direct disk access hint */
+#endif
+#ifndef O_LARGEFILE
+#define O_LARGEFILE     00100000
+#endif
+#ifndef O_DIRECTORY
+#define O_DIRECTORY     00200000        /* must be a directory */
+#endif
+#ifndef O_NOFOLLOW
+#define O_NOFOLLOW      00400000        /* don't follow links */
+#endif
+#ifndef O_NOATIME
+#define O_NOATIME       01000000
+#endif
+#ifndef O_NDELAY
+#define O_NDELAY        O_NONBLOCK
+#endif
+
+#define F_DUPFD         0       /* dup */
+#define F_GETFD         1       /* get close_on_exec */
+#define F_SETFD         2       /* set/clear close_on_exec */
+#define F_GETFL         3       /* get file->f_flags */
+#define F_SETFL         4       /* set file->f_flags */
+#ifndef F_GETLK
+#define F_GETLK         5
+#define F_SETLK         6
+#define F_SETLKW        7
+#endif
+#ifndef F_SETOWN
+#define F_SETOWN        8       /* for sockets. */
+#define F_GETOWN        9       /* for sockets. */
+#endif
+#ifndef F_SETSIG
+#define F_SETSIG        10      /* for sockets. */
+#define F_GETSIG        11      /* for sockets. */
+#endif
+
+/* for F_[GET|SET]FL */
+#define FD_CLOEXEC      1       /* actually anything with low bit set goes */
+
+/* for posix fcntl() and lockf() */
+#ifndef F_RDLCK
+#define F_RDLCK         0
+#define F_WRLCK         1
+#define F_UNLCK         2
+#endif
+
+/* for old implementation of bsd flock () */
+#ifndef F_EXLCK
+#define F_EXLCK         4       /* or 3 */
+#define F_SHLCK         8       /* or 4 */
+#endif
+
+/* for leases */
+#ifndef F_INPROGRESS
+#define F_INPROGRESS    16
+#endif
+
+/* operations for bsd flock(), also used by the kernel implementation */
+#define LOCK_SH         1       /* shared lock */
+#define LOCK_EX         2       /* exclusive lock */
+#define LOCK_NB         4       /* or'd with one of the above to prevent
+                                   blocking */
+#define LOCK_UN         8       /* remove lock */
+
+#define LOCK_MAND       32      /* This is a mandatory flock ... */
+#define LOCK_READ       64      /* which allows concurrent read operations */
+#define LOCK_WRITE      128     /* which allows concurrent write operations */
+#define LOCK_RW         192     /* which allows concurrent read & write ops */
+
+#define F_LINUX_SPECIFIC_BASE   1024
+
+#ifndef HAVE_ARCH_STRUCT_FLOCK
+#ifndef __ARCH_FLOCK_PAD
+#define __ARCH_FLOCK_PAD
+#endif
+
+struct flock {
+        short   l_type;
+        short   l_whence;
+        off_t   l_start;
+        off_t   l_len;
+        pid_t   l_pid;
+        __ARCH_FLOCK_PAD
+};
+#endif
+
+#ifndef CONFIG_64BIT
+
+#ifndef F_GETLK64
+#define F_GETLK64       12      /*  using 'struct flock64' */
+#define F_SETLK64       13
+#define F_SETLKW64      14
+#endif
+
+#ifndef HAVE_ARCH_STRUCT_FLOCK64
+#ifndef __ARCH_FLOCK64_PAD
+#define __ARCH_FLOCK64_PAD
+#endif
+
+struct flock64 {
+        short  l_type;
+        short  l_whence;
+        loff_t l_start;
+        loff_t l_len;
+        pid_t  l_pid;
+        __ARCH_FLOCK64_PAD
+};
+#endif
+#endif /* !CONFIG_64BIT */
+
+#endif /* _ASM_GENERIC_FCNTL_H */
diff --git a/include/asm-generic/hdreg.h b/include/asm-generic/hdreg.h
deleted file mode 100644
index 7051fba8bcf9..000000000000
--- a/include/asm-generic/hdreg.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#warning <asm/hdreg.h> is obsolete, please do not use it
-
-#ifndef __ASM_GENERIC_HDREG_H
-#define __ASM_GENERIC_HDREG_H
-
-typedef unsigned long ide_ioreg_t;
-
-#endif /* __ASM_GENERIC_HDREG_H */
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index 450eae22c39a..886dbd116899 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -12,5 +12,6 @@ extern char _sextratext[] __attribute__((weak));
 extern char _eextratext[] __attribute__((weak));
 extern char _end[];
 extern char __per_cpu_start[], __per_cpu_end[];
+extern char __kprobes_text_start[], __kprobes_text_end[];
 
 #endif /* _ASM_GENERIC_SECTIONS_H_ */
diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h
index 6c90f0f36eec..4dc8ddb401c1 100644
--- a/include/asm-generic/unaligned.h
+++ b/include/asm-generic/unaligned.h
@@ -16,9 +16,9 @@
  * The main single-value unaligned transfer routines.
  */
 #define get_unaligned(ptr) \
-        ((__typeof__(*(ptr)))__get_unaligned((ptr), sizeof(*(ptr))))
+        __get_unaligned((ptr), sizeof(*(ptr)))
 #define put_unaligned(x,ptr) \
-        __put_unaligned((unsigned long)(x), (ptr), sizeof(*(ptr)))
+        __put_unaligned((__u64)(x), (ptr), sizeof(*(ptr)))
 
 /*
  * This function doesn't actually exist.  The idea is that when
@@ -36,19 +36,19 @@ struct __una_u16 { __u16 x __attribute__((packed)); };
  * Elemental unaligned loads 
  */
 
-static inline unsigned long __uldq(const __u64 *addr)
+static inline __u64 __uldq(const __u64 *addr)
 {
         const struct __una_u64 *ptr = (const struct __una_u64 *) addr;
         return ptr->x;
 }
 
-static inline unsigned long __uldl(const __u32 *addr)
+static inline __u32 __uldl(const __u32 *addr)
 {
         const struct __una_u32 *ptr = (const struct __una_u32 *) addr;
         return ptr->x;
 }
 
-static inline unsigned long __uldw(const __u16 *addr)
+static inline __u16 __uldw(const __u16 *addr)
 {
         const struct __una_u16 *ptr = (const struct __una_u16 *) addr;
         return ptr->x;
@@ -78,7 +78,7 @@ static inline void __ustw(__u16 val, __u16 *addr)
 
 #define __get_unaligned(ptr, size) ({           \
         const void *__gu_p = ptr;               \
-        unsigned long val;                      \
+        __typeof__(*(ptr)) val;                 \
         switch (size) {                         \
         case 1:                                 \
                 val = *(const __u8 *)__gu_p;    \
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 3fa94288aa93..6f857be2b644 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -97,3 +97,9 @@
                 VMLINUX_SYMBOL(__lock_text_start) = .;                  \
                 *(.spinlock.text)                                       \
                 VMLINUX_SYMBOL(__lock_text_end) = .;
+
+#define KPROBES_TEXT                                                    \
+                ALIGN_FUNCTION();                                       \
+                VMLINUX_SYMBOL(__kprobes_text_start) = .;               \
+                *(.kprobes.text)                                        \
+                VMLINUX_SYMBOL(__kprobes_text_end) = .;