90 files changed, 929 insertions, 864 deletions
diff --git a/include/asm-alpha/poll.h b/include/asm-alpha/poll.h
index 76f89356b6a7..c98509d3149e 100644
--- a/include/asm-alpha/poll.h
+++ b/include/asm-alpha/poll.h
@@ -1,25 +1 @@
-#ifndef __ALPHA_POLL_H
+#include <asm-generic/poll.h>
-#define __ALPHA_POLL_H
-#define POLLIN          (1 << 0)
-#define POLLPRI         (1 << 1)
-#define POLLOUT         (1 << 2)
-#define POLLERR         (1 << 3)
-#define POLLHUP         (1 << 4)
-#define POLLNVAL        (1 << 5)
-#define POLLRDNORM      (1 << 6)
-#define POLLRDBAND      (1 << 7)
-#define POLLWRNORM      (1 << 8)
-#define POLLWRBAND      (1 << 9)
-#define POLLMSG         (1 << 10)
-#define POLLREMOVE      (1 << 12)
-#define POLLRDHUP       (1 << 13)
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-arm/poll.h b/include/asm-arm/poll.h
index 5030b2b232a3..c98509d3149e 100644
--- a/include/asm-arm/poll.h
+++ b/include/asm-arm/poll.h
@@ -1,27 +1 @@
-#ifndef __ASMARM_POLL_H
+#include <asm-generic/poll.h>
-#define __ASMARM_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-arm26/poll.h b/include/asm-arm26/poll.h
index 9ccb7f4190ca..1170e7065f6a 100644
--- a/include/asm-arm26/poll.h
+++ b/include/asm-arm26/poll.h
@@ -1,26 +1,8 @@
 #ifndef __ASMARM_POLL_H
 #define __ASMARM_POLL_H
-/* These are specified by iBCS2 */
+#include <asm-generic/poll.h>
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
+#undef POLLREMOVE
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
 #endif
diff --git a/include/asm-avr32/poll.h b/include/asm-avr32/poll.h
index 736e29755dfc..c98509d3149e 100644
--- a/include/asm-avr32/poll.h
+++ b/include/asm-avr32/poll.h
@@ -1,27 +1 @@
-#ifndef __ASM_AVR32_POLL_H
+#include <asm-generic/poll.h>
-#define __ASM_AVR32_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif /* __ASM_AVR32_POLL_H */
diff --git a/include/asm-cris/poll.h b/include/asm-cris/poll.h
index 1b25d4cf498c..c98509d3149e 100644
--- a/include/asm-cris/poll.h
+++ b/include/asm-cris/poll.h
@@ -1,26 +1 @@
-#ifndef __ASM_CRIS_POLL_H
+#include <asm-generic/poll.h>
-#define __ASM_CRIS_POLL_H
-/* taken from asm-alpha */
-#define POLLIN          1
-#define POLLPRI         2
-#define POLLOUT         4
-#define POLLERR         8
-#define POLLHUP         16
-#define POLLNVAL        32
-#define POLLRDNORM      64
-#define POLLRDBAND      128
-#define POLLWRNORM      256
-#define POLLWRBAND      512
-#define POLLMSG         1024
-#define POLLREMOVE      4096
-#define POLLRDHUP       8192
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-frv/poll.h b/include/asm-frv/poll.h
index c8fe8801d075..0d01479ccc56 100644
--- a/include/asm-frv/poll.h
+++ b/include/asm-frv/poll.h
@@ -1,24 +1,12 @@
 #ifndef _ASM_POLL_H
 #define _ASM_POLL_H
-#define POLLIN            1
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
-#define POLLMSG         0x0400
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
+#undef POLLREMOVE
-        short revents;
-};
 #endif
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index fa14f8cd30c5..5bfeef761649 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -4,6 +4,7 @@ header-y += fcntl.h
 header-y += ioctl.h
 header-y += ipc.h
 header-y += mman.h
+header-y += poll.h
 header-y += signal.h
 header-y += statfs.h
diff --git a/include/asm-generic/audit_signal.h b/include/asm-generic/audit_signal.h
new file mode 100644
index 000000000000..6feab7f18a53
--- /dev/null
+++ b/include/asm-generic/audit_signal.h
@@ -0,0 +1,3 @@
+__NR_kill,
+__NR_tgkill,
+__NR_tkill,
diff --git a/include/asm-generic/poll.h b/include/asm-generic/poll.h
new file mode 100644
index 000000000000..44bce836d350
--- /dev/null
+++ b/include/asm-generic/poll.h
@@ -0,0 +1,37 @@
+#ifndef __ASM_GENERIC_POLL_H
+#define __ASM_GENERIC_POLL_H
+/* These are specified by iBCS2 */
+#define POLLIN          0x0001
+#define POLLPRI         0x0002
+#define POLLOUT         0x0004
+#define POLLERR         0x0008
+#define POLLHUP         0x0010
+#define POLLNVAL        0x0020
+/* The rest seem to be more-or-less nonstandard. Check them! */
+#define POLLRDNORM      0x0040
+#define POLLRDBAND      0x0080
+#ifndef POLLWRNORM
+#define POLLWRNORM      0x0100
+#endif
+#ifndef POLLWRBAND
+#define POLLWRBAND      0x0200
+#endif
+#ifndef POLLMSG
+#define POLLMSG         0x0400
+#endif
+#ifndef POLLREMOVE
+#define POLLREMOVE      0x1000
+#endif
+#ifndef POLLRDHUP
+#define POLLRDHUP       0x2000
+#endif
+struct pollfd {
+        int fd;
+        short events;
+        short revents;
+};
+#endif  /* __ASM_GENERIC_POLL_H */
diff --git a/include/asm-h8300/poll.h b/include/asm-h8300/poll.h
index fc52103b276a..f61540c22d94 100644
--- a/include/asm-h8300/poll.h
+++ b/include/asm-h8300/poll.h
@@ -1,23 +1,11 @@
 #ifndef __H8300_POLL_H
 #define __H8300_POLL_H
-#define POLLIN            1
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
-#define POLLMSG         0x0400
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
+#undef POLLREMOVE
-        short revents;
-};
 #endif
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
index 7ddd414f8d16..99f3c3561ecb 100644
--- a/include/asm-h8300/unistd.h
+++ b/include/asm-h8300/unistd.h
@@ -21,7 +21,7 @@
 #define __NR_time                13
 #define __NR_mknod               14
 #define __NR_chmod               15
-#define __NR_chown               16
+#define __NR_lchown              16
 #define __NR_break               17
 #define __NR_oldstat             18
 #define __NR_lseek               19
@@ -115,10 +115,10 @@
 #define __NR_lstat              107
 #define __NR_fstat              108
 #define __NR_olduname           109
-#define __NR_iopl               /* 110 */ not supported
+#define __NR_iopl               110
 #define __NR_vhangup            111
-#define __NR_idle               /* 112 */ Obsolete
+#define __NR_idle               112
-#define __NR_vm86               /* 113 */ not supported
+#define __NR_vm86old            113
 #define __NR_wait4              114
 #define __NR_swapoff            115
 #define __NR_sysinfo            116
@@ -128,7 +128,7 @@
 #define __NR_clone              120
 #define __NR_setdomainname      121
 #define __NR_uname              122
-#define __NR_cacheflush         123
+#define __NR_modify_ldt         123
 #define __NR_adjtimex           124
 #define __NR_mprotect           125
 #define __NR_sigprocmask        126
@@ -171,7 +171,7 @@
 #define __NR_mremap             163
 #define __NR_setresuid          164
 #define __NR_getresuid          165
-#define __NR_getpagesize        166
+#define __NR_vm86               166
 #define __NR_query_module       167
 #define __NR_poll               168
 #define __NR_nfsservctl         169
@@ -187,7 +187,7 @@
 #define __NR_rt_sigsuspend      179
 #define __NR_pread64            180
 #define __NR_pwrite64           181
-#define __NR_lchown             182
+#define __NR_chown              182
 #define __NR_getcwd             183
 #define __NR_capget             184
 #define __NR_capset             185
@@ -203,7 +203,7 @@
 #define __NR_stat64             195
 #define __NR_lstat64            196
 #define __NR_fstat64            197
-#define __NR_chown32            198
+#define __NR_lchown32           198
 #define __NR_getuid32           199
 #define __NR_getgid32           200
 #define __NR_geteuid32          201
@@ -217,15 +217,18 @@
 #define __NR_getresuid32        209
 #define __NR_setresgid32        210
 #define __NR_getresgid32        211
-#define __NR_lchown32           212
+#define __NR_chown32            212
 #define __NR_setuid32           213
 #define __NR_setgid32           214
 #define __NR_setfsuid32         215
 #define __NR_setfsgid32         216
 #define __NR_pivot_root         217
+#define __NR_mincore            218
+#define __NR_madvise            219
+#define __NR_madvise1           219
 #define __NR_getdents64         220
 #define __NR_fcntl64            221
-#define __NR_security           223
+/* 223 is unused */
 #define __NR_gettid             224
 #define __NR_readahead          225
 #define __NR_setxattr           226
@@ -252,13 +255,13 @@
 #define __NR_io_getevents       247
 #define __NR_io_submit          248
 #define __NR_io_cancel          249
-#define __NR_alloc_hugepages    250
+#define __NR_fadvise64          250
-#define __NR_free_hugepages     251
+/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
 #define __NR_exit_group         252
 #define __NR_lookup_dcookie     253
-#define __NR_sys_epoll_create   254
+#define __NR_epoll_create       254
-#define __NR_sys_epoll_ctl      255
+#define __NR_epoll_ctl          255
-#define __NR_sys_epoll_wait     256
+#define __NR_epoll_wait         256
 #define __NR_remap_file_pages   257
 #define __NR_set_tid_address    258
 #define __NR_timer_create       259
@@ -291,10 +294,41 @@
 #define __NR_add_key            286
 #define __NR_request_key        287
 #define __NR_keyctl             288
+#define __NR_ioprio_set         289
+#define __NR_ioprio_get         290
+#define __NR_inotify_init       291
+#define __NR_inotify_add_watch  292
+#define __NR_inotify_rm_watch   293
+#define __NR_migrate_pages      294
+#define __NR_openat             295
+#define __NR_mkdirat            296
+#define __NR_mknodat            297
+#define __NR_fchownat           298
+#define __NR_futimesat          299
+#define __NR_fstatat64          300
+#define __NR_unlinkat           301
+#define __NR_renameat           302
+#define __NR_linkat             303
+#define __NR_symlinkat          304
+#define __NR_readlinkat         305
+#define __NR_fchmodat           306
+#define __NR_faccessat          307
+#define __NR_pselect6           308
+#define __NR_ppoll              309
+#define __NR_unshare            310
+#define __NR_set_robust_list    311
+#define __NR_get_robust_list    312
+#define __NR_splice             313
+#define __NR_sync_file_range    314
+#define __NR_tee                315
+#define __NR_vmsplice           316
+#define __NR_move_pages         317
+#define __NR_getcpu             318
+#define __NR_epoll_pwait        319
 #ifdef __KERNEL__
-#define NR_syscalls 289
+#define NR_syscalls 320
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h
index 0f70b379b029..eb7da5402bfa 100644
--- a/include/asm-i386/alternative.h
+++ b/include/asm-i386/alternative.h
@@ -98,6 +98,12 @@ static inline void alternatives_smp_switch(int smp) {}
                      ".previous" : output : [feat] "i" (feature), ##input)
 /*
+ * use this macro(s) if you need more than one output parameter
+ * in alternative_io
+ */
+#define ASM_OUTPUT2(a, b) a, b
+/*
 * Alternative inline assembly for SMP.
 *
 * The LOCK_PREFIX macro defined here replaces the LOCK and
diff --git a/include/asm-i386/poll.h b/include/asm-i386/poll.h
index 2cd4929abd40..c98509d3149e 100644
--- a/include/asm-i386/poll.h
+++ b/include/asm-i386/poll.h
@@ -1,27 +1 @@
-#ifndef __i386_POLL_H
+#include <asm-generic/poll.h>
-#define __i386_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-i386/tsc.h b/include/asm-i386/tsc.h
index 3f3c1fa000b4..62c091ffcccc 100644
--- a/include/asm-i386/tsc.h
+++ b/include/asm-i386/tsc.h
@@ -35,14 +35,16 @@ static inline cycles_t get_cycles(void)
 static __always_inline cycles_t get_cycles_sync(void)
 {
        unsigned long long ret;
-        unsigned eax;
+        unsigned eax, edx;
        /*
         * Use RDTSCP if possible; it is guaranteed to be synchronous
         * and doesn't cause a VMEXIT on Hypervisors
         */
        alternative_io(ASM_NOP3, ".byte 0x0f,0x01,0xf9", X86_FEATURE_RDTSCP,
-                                 "=A" (ret), "0" (0ULL) : "ecx", "memory");
+                       ASM_OUTPUT2("=a" (eax), "=d" (edx)),
+                       "a" (0U), "d" (0U) : "ecx", "memory");
+        ret = (((unsigned long long)edx) << 32) | ((unsigned long long)eax);
        if (ret)
                return ret;
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index bd21e795197c..e84ace1ec8bf 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -326,10 +326,13 @@
 #define __NR_getcpu             318
 #define __NR_epoll_pwait        319
 #define __NR_utimensat          320
+#define __NR_signalfd           321
+#define __NR_timerfd            322
+#define __NR_eventfd            323
 #ifdef __KERNEL__
-#define NR_syscalls 321
+#define NR_syscalls 324
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-ia64/poll.h b/include/asm-ia64/poll.h
index bcaf9f140242..c98509d3149e 100644
--- a/include/asm-ia64/poll.h
+++ b/include/asm-ia64/poll.h
@@ -1,32 +1 @@
-#ifndef _ASM_IA64_POLL_H
+#include <asm-generic/poll.h>
-#define _ASM_IA64_POLL_H
-/*
- * poll(2) bit definitions.  Based on <asm-i386/poll.h>.
- *
- * Modified 1998, 1999, 2002
- *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
- */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif /* _ASM_IA64_POLL_H */
diff --git a/include/asm-m32r/pgtable-2level.h b/include/asm-m32r/pgtable-2level.h
index 750925726a10..bca3475f9595 100644
--- a/include/asm-m32r/pgtable-2level.h
+++ b/include/asm-m32r/pgtable-2level.h
@@ -71,8 +71,8 @@ static inline pmd_t *pmd_offset(pgd_t * dir, unsigned long address)
 #define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 #define PTE_FILE_MAX_BITS       29
-#define pte_to_pgoff(pte)       (((pte_val(pte) >> 2) & 0xef) | (((pte_val(pte) >> 10)) << 7))
+#define pte_to_pgoff(pte)       (((pte_val(pte) >> 2) & 0x7f) | (((pte_val(pte) >> 10)) << 7))
-#define pgoff_to_pte(off)       ((pte_t) { (((off) & 0xef) << 2) | (((off) >> 7) << 10) | _PAGE_FILE })
+#define pgoff_to_pte(off)       ((pte_t) { (((off) & 0x7f) << 2) | (((off) >> 7) << 10) | _PAGE_FILE })
 #endif /* __KERNEL__ */
 #endif /* _ASM_M32R_PGTABLE_2LEVEL_H */
diff --git a/include/asm-m32r/pgtable.h b/include/asm-m32r/pgtable.h
index 8b2a2f17e695..6604303fc47c 100644
--- a/include/asm-m32r/pgtable.h
+++ b/include/asm-m32r/pgtable.h
@@ -366,7 +366,7 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
 #define pte_unmap_nested(pte)   do { } while (0)
 /* Encode and de-code a swap entry */
-#define __swp_type(x)                   (((x).val >> 2) & 0x3f)
+#define __swp_type(x)                   (((x).val >> 2) & 0x1f)
 #define __swp_offset(x)                 ((x).val >> 10)
 #define __swp_entry(type, offset)       \
        ((swp_entry_t) { ((type) << 2) | ((offset) << 10) })
diff --git a/include/asm-m32r/poll.h b/include/asm-m32r/poll.h
index 9e0e700e727c..c98509d3149e 100644
--- a/include/asm-m32r/poll.h
+++ b/include/asm-m32r/poll.h
@@ -1,32 +1 @@
-#ifndef _ASM_M32R_POLL_H
+#include <asm-generic/poll.h>
-#define _ASM_M32R_POLL_H
-/*
- * poll(2) bit definitions.  Based on <asm-i386/poll.h>.
- *
- * Modified 2004
- *      Hirokazu Takata <takata at linux-m32r.org>
- */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif  /* _ASM_M32R_POLL_H */
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index f62f5c9abba6..b291b2f72954 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -21,12 +21,22 @@
 * `next' and `prev' should be struct task_struct, but it isn't always defined
 */
+#if defined(CONFIG_FRAME_POINTER) || \
+        !defined(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER)
+#define M32R_PUSH_FP "  push fp\n"
+#define M32R_POP_FP  "  pop  fp\n"
+#else
+#define M32R_PUSH_FP ""
+#define M32R_POP_FP  ""
+#endif
 #define switch_to(prev, next, last)  do { \
        __asm__ __volatile__ ( \
                "       seth    lr, #high(1f)                           \n" \
                "       or3     lr, lr, #low(1f)                        \n" \
                "       st      lr, @%4  ; store old LR                 \n" \
                "       ld      lr, @%5  ; load new LR                  \n" \
+                        M32R_PUSH_FP \
                "       st      sp, @%2  ; store old SP                 \n" \
                "       ld      sp, @%3  ; load new SP                  \n" \
                "       push    %1  ; store `prev' on new stack         \n" \
@@ -34,6 +44,7 @@
                "       .fillinsn                                       \n" \
                "1:                                                     \n" \
                "       pop     %0  ; restore `__last' from new stack   \n" \
+                        M32R_POP_FP \
                : "=r" (last) \
                : "0" (prev), \
                  "r" (&(prev->thread.sp)), "r" (&(next->thread.sp)), \
diff --git a/include/asm-m68k/poll.h b/include/asm-m68k/poll.h
index 0fb8843647f8..f080fcdb61bf 100644
--- a/include/asm-m68k/poll.h
+++ b/include/asm-m68k/poll.h
@@ -1,24 +1,9 @@
 #ifndef __m68k_POLL_H
 #define __m68k_POLL_H
-#define POLLIN            1
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
 #endif
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h
index 62daa746a9c9..1b60624dab7e 100644
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
@@ -689,7 +689,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
 }
 #define atomic64_cmpxchg(v, o, n) \
-        (((__typeof__((v)->counter)))cmpxchg(&((v)->counter), (o), (n)))
+        ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
 #define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
 /**
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index dbf834f4dac4..b0c329783ac5 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -119,9 +119,9 @@
 */
 #define MACH_GROUP_MOMENCO      12      /* Momentum Boards              */
 #define  MACH_MOMENCO_OCELOT    0
-#define  MACH_MOMENCO_OCELOT_G  1
+#define  MACH_MOMENCO_OCELOT_G  1       /* no more supported (may 2007) */
 #define  MACH_MOMENCO_OCELOT_C  2
-#define  MACH_MOMENCO_JAGUAR_ATX 3
+#define  MACH_MOMENCO_JAGUAR_ATX 3      /* no more supported (may 2007) */
 #define  MACH_MOMENCO_OCELOT_3  4
 /*
diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h
index b414a7d9db43..483685b1592e 100644
--- a/include/asm-mips/fpu.h
+++ b/include/asm-mips/fpu.h
@@ -16,6 +16,7 @@
 #include <asm/mipsregs.h>
 #include <asm/cpu.h>
 #include <asm/cpu-features.h>
+#include <asm/hazards.h>
 #include <asm/bitops.h>
 #include <asm/processor.h>
 #include <asm/current.h>
@@ -38,34 +39,16 @@ extern void _init_fpu(void);
 extern void _save_fp(struct task_struct *);
 extern void _restore_fp(struct task_struct *);
-#if defined(CONFIG_CPU_SB1)
-#define __enable_fpu_hazard()                                           \
-do {                                                                    \
-        asm(".set       push            \n\t"                           \
-            ".set       mips64          \n\t"                           \
-            ".set       noreorder       \n\t"                           \
-            "ssnop                      \n\t"                           \
-            "bnezl      $0, .+4         \n\t"                           \
-            "ssnop                      \n\t"                           \
-            ".set pop");                                                \
-} while (0)
-#else
-#define __enable_fpu_hazard()                                           \
-do {                                                                    \
-        asm("nop;nop;nop;nop");         /* max. hazard */               \
-} while (0)
-#endif
 #define __enable_fpu()                                                  \
 do {                                                                    \
        set_c0_status(ST0_CU1);                                         \
-        __enable_fpu_hazard();                                          \
+        enable_fpu_hazard();                                            \
 } while (0)
 #define __disable_fpu()                                                 \
 do {                                                                    \
        clear_c0_status(ST0_CU1);                                       \
-        /* We don't care about the c0 hazard here  */                   \
+        disable_fpu_hazard();                                           \
 } while (0)
 #define enable_fpu()                                                    \
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index e50c77e69cb5..d9119f43f9aa 100644
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -178,4 +178,36 @@ ASMMACRO(back_to_back_c0_hazard,
 #endif
+/* FPU hazards */
+#if defined(CONFIG_CPU_SB1)
+ASMMACRO(enable_fpu_hazard,
+         .set   push;
+         .set   mips64;
+         .set   noreorder;
+         _ssnop;
+         bnezl  $0,.+4;
+         _ssnop;
+         .set   pop
+)
+ASMMACRO(disable_fpu_hazard,
+)
+#elif defined(CONFIG_CPU_MIPSR2)
+ASMMACRO(enable_fpu_hazard,
+         _ehb
+)
+ASMMACRO(disable_fpu_hazard,
+         _ehb
+)
+#else
+ASMMACRO(enable_fpu_hazard,
+         nop; nop; nop; nop
+)
+ASMMACRO(disable_fpu_hazard,
+         _ehb
+)
+#endif
 #endif /* _ASM_HAZARDS_H */
diff --git a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
index f8c8182f7f2e..4d6bd5c31c7b 100644
--- a/include/asm-mips/highmem.h
+++ b/include/asm-mips/highmem.h
@@ -48,46 +48,6 @@ extern pte_t *pkmap_page_table;
 extern void * kmap_high(struct page *page);
 extern void kunmap_high(struct page *page);
-/*
- * CONFIG_LIMITED_DMA is for systems with DMA limitations such as Momentum's
- * Jaguar ATX.  This option exploits the highmem code in the kernel so is
- * always enabled together with CONFIG_HIGHMEM but at this time doesn't
- * actually add highmem functionality.
- */
-#ifdef CONFIG_LIMITED_DMA
-/*
- * These are the default functions for the no-highmem case from
- * <linux/highmem.h>
- */
-static inline void *kmap(struct page *page)
-{
-        might_sleep();
-        return page_address(page);
-}
-#define kunmap(page) do { (void) (page); } while (0)
-static inline void *kmap_atomic(struct page *page, enum km_type type)
-{
-        pagefault_disable();
-        return page_address(page);
-}
-static inline void kunmap_atomic(void *kvaddr, enum km_type type)
-{
-        pagefault_enable();
-}
-#define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx))
-#define kmap_atomic_to_page(ptr) virt_to_page(ptr)
-#define flush_cache_kmaps()     do { } while (0)
-#else /* LIMITED_DMA */
 extern void *__kmap(struct page *page);
 extern void __kunmap(struct page *page);
 extern void *__kmap_atomic(struct page *page, enum km_type type);
@@ -103,8 +63,6 @@ extern struct page *__kmap_atomic_to_page(void *ptr);
 #define flush_cache_kmaps()     flush_cache_all()
-#endif /* LIMITED_DMA */
 #endif /* __KERNEL__ */
 #endif /* _ASM_HIGHMEM_H */
diff --git a/include/asm-mips/mach-cobalt/cobalt.h b/include/asm-mips/mach-cobalt/cobalt.h
index 24a8d51a55a3..684a501c04cf 100644
--- a/include/asm-mips/mach-cobalt/cobalt.h
+++ b/include/asm-mips/mach-cobalt/cobalt.h
@@ -69,6 +69,8 @@
 #define COBALT_BRD_ID_QUBE2    0x5
 #define COBALT_BRD_ID_RAQ2     0x6
+extern int cobalt_board_id;
 #define PCI_CFG_SET(devfn,where)                                        \
        GT_WRITE(GT_PCI0_CFGADDR_OFS, (0x80000000 | (PCI_SLOT (devfn) << 11) |          \
                (PCI_FUNC (devfn) << 8) | (where)))
diff --git a/include/asm-mips/mach-ja/cpu-feature-overrides.h b/include/asm-mips/mach-ja/cpu-feature-overrides.h
deleted file mode 100644
index 84b6dead0e8a..000000000000
--- a/include/asm-mips/mach-ja/cpu-feature-overrides.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2003, 2004 Ralf Baechle
- */
-#ifndef __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H
-/*
- * Momentum Jaguar ATX always has the RM9000 processor.
- */
-#define cpu_has_watch           1
-#define cpu_has_mips16          0
-#define cpu_has_divec           0
-#define cpu_has_vce             0
-#define cpu_has_cache_cdex_p    0
-#define cpu_has_cache_cdex_s    0
-#define cpu_has_prefetch        1
-#define cpu_has_mcheck          0
-#define cpu_has_ejtag           0
-#define cpu_has_llsc            1
-#define cpu_has_vtag_icache     0
-#define cpu_has_dc_aliases      0
-#define cpu_has_ic_fills_f_dc   0
-#define cpu_has_dsp             0
-#define cpu_icache_snoops_remote_store  0
-#define cpu_has_nofpuex         0
-#define cpu_has_64bits          1
-#define cpu_has_inclusive_pcaches       0
-#define cpu_dcache_line_size()  32
-#define cpu_icache_line_size()  32
-#define cpu_scache_line_size()  32
-#define cpu_has_mips32r1        0
-#define cpu_has_mips32r2        0
-#define cpu_has_mips64r1        0
-#define cpu_has_mips64r2        0
-#endif /* __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H */
diff --git a/include/asm-mips/mach-ja/spaces.h b/include/asm-mips/mach-ja/spaces.h
deleted file mode 100644
index 8466a0e69c79..000000000000
--- a/include/asm-mips/mach-ja/spaces.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle
- * Copyright (C) 2000, 2002  Maciej W. Rozycki
- * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc.
- */
-#ifndef __ASM_MACH_JA_SPACES_H
-#define __ASM_MACH_JA_SPACES_H
-/*
- * Memory above this physical address will be considered highmem.
- */
-#define HIGHMEM_START           0x08000000UL
-#include_next <spaces.h>
-#endif /* __ASM_MACH_JA_SPACES_H */
diff --git a/include/asm-mips/mips-boards/malta.h b/include/asm-mips/mips-boards/malta.h
index b0ba3c5a921e..eec91001bb65 100644
--- a/include/asm-mips/mips-boards/malta.h
+++ b/include/asm-mips/mips-boards/malta.h
@@ -25,6 +25,10 @@
 #include <asm/mips-boards/msc01_pci.h>
 #include <asm/gt64120.h>
+/* Mips interrupt controller found in SOCit variations */
+#define MIPS_MSC01_IC_REG_BASE          0x1bc40000
+#define MIPS_SOCITSC_IC_REG_BASE        0x1ffa0000
 /*
 * Malta I/O ports base address for the Galileo GT64120 and Algorithmics
 * Bonito system controllers.
diff --git a/include/asm-mips/msc01_ic.h b/include/asm-mips/msc01_ic.h
index aa7ad9a71762..7989b9ffc1d2 100644
--- a/include/asm-mips/msc01_ic.h
+++ b/include/asm-mips/msc01_ic.h
@@ -94,10 +94,7 @@
 /*
 * MIPS System controller interrupt register base.
 *
- * FIXME - are these macros specific to Malta and co or to the MSC?  If the
- * latter, they should be moved elsewhere.
 */
-#define MIPS_MSC01_IC_REG_BASE  0x1bc40000
 /*****************************************************************************
 * Absolute register addresses
@@ -144,7 +141,7 @@ typedef struct msc_irqmap {
 #define MSC01_IRQ_LEVEL         0
 #define MSC01_IRQ_EDGE          1
-extern void __init init_msc_irqs(unsigned int base, msc_irqmap_t *imp, int nirq);
+extern void __init init_msc_irqs(unsigned long icubase, unsigned int base, msc_irqmap_t *imp, int nirq);
 extern void ll_msc_irq(void);
 #endif /* __ASM_MIPS_BOARDS_MSC01_IC_H */
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index d3fbd83ff545..5c3239dad0f2 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -190,10 +190,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define UNCAC_ADDR(addr)        ((addr) - PAGE_OFFSET + UNCAC_BASE)
 #define CAC_ADDR(addr)          ((addr) - UNCAC_BASE + PAGE_OFFSET)
-#ifdef CONFIG_LIMITED_DMA
-#define WANT_PAGE_VIRTUAL
-#endif
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
diff --git a/include/asm-mips/poll.h b/include/asm-mips/poll.h
index 70881f8c5c50..47b952080431 100644
--- a/include/asm-mips/poll.h
+++ b/include/asm-mips/poll.h
@@ -1,28 +1,9 @@
 #ifndef __ASM_POLL_H
 #define __ASM_POLL_H
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
 #define POLLWRNORM      POLLOUT
 #define POLLWRBAND      0x0100
-/* These seem to be more or less nonstandard ...  */
+#include <asm-generic/poll.h>
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
 #endif /* __ASM_POLL_H */
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index d7a65135d837..ce51213d84f9 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -81,25 +81,6 @@
 #define STD_SERIAL_PORT_DEFNS
 #endif /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */
-#ifdef CONFIG_MOMENCO_JAGUAR_ATX
-/* Ordinary NS16552 duart with a 20MHz crystal.  */
-#define JAGUAR_ATX_UART_CLK     20000000
-#define JAGUAR_ATX_BASE_BAUD    (JAGUAR_ATX_UART_CLK / 16)
-#define JAGUAR_ATX_SERIAL1_IRQ  6
-#define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L
-#define _JAGUAR_ATX_SERIAL_INIT(int, base)                              \
-        { .baud_base = JAGUAR_ATX_BASE_BAUD, irq: int,                  \
-          .flags = (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),             \
-          .iomem_base = (u8 *) base, iomem_reg_shift: 2,                        \
-          io_type: SERIAL_IO_MEM }
-#define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS                            \
-        _JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
-#else
-#define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS
-#endif
 #ifdef CONFIG_MOMENCO_OCELOT_3
 #define OCELOT_3_BASE_BAUD      ( 20000000 / 16 )
 #define OCELOT_3_SERIAL_IRQ     6
@@ -134,27 +115,6 @@
 #define MOMENCO_OCELOT_SERIAL_PORT_DEFNS
 #endif
-#ifdef CONFIG_MOMENCO_OCELOT_G
-/* Ordinary NS16552 duart with a 20MHz crystal.  */
-#define OCELOT_G_BASE_BAUD ( 20000000 / 16 )
-#define OCELOT_G_SERIAL1_IRQ    4
-#if 0
-#define OCELOT_G_SERIAL1_BASE   0xe0001020
-#else
-#define OCELOT_G_SERIAL1_BASE   0xfd000020
-#endif
-#define _OCELOT_G_SERIAL_INIT(int, base)                                \
-        { .baud_base = OCELOT_G_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,\
-          .iomem_base = (u8 *) base, .iomem_reg_shift = 2,                      \
-          .io_type = SERIAL_IO_MEM }
-#define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS                              \
-        _OCELOT_G_SERIAL_INIT(OCELOT_G_SERIAL1_IRQ, OCELOT_G_SERIAL1_BASE)
-#else
-#define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS
-#endif
 #ifdef CONFIG_MOMENCO_OCELOT_C
 /* Ordinary NS16552 duart with a 20MHz crystal.  */
 #define OCELOT_C_BASE_BAUD ( 20000000 / 16 )
@@ -210,7 +170,6 @@
        IP32_SERIAL_PORT_DEFNS                          \
        JAZZ_SERIAL_PORT_DEFNS                          \
        STD_SERIAL_PORT_DEFNS                           \
-        MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS              \
        MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS              \
        MOMENCO_OCELOT_SERIAL_PORT_DEFNS                \
        MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS
diff --git a/include/asm-mips/sgi/seeq.h b/include/asm-mips/sgi/seeq.h
new file mode 100644
index 000000000000..af0ffd76899d
--- /dev/null
+++ b/include/asm-mips/sgi/seeq.h
@@ -0,0 +1,21 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 by Ralf Baechle
+ */
+#ifndef __ASM_SGI_SEEQ_H
+#define __ASM_SGI_SEEQ_H
+#include <linux/if_ether.h>
+#include <asm/sgi/hpc3.h>
+struct sgiseeq_platform_data {
+        struct hpc3_regs *hpc;
+        unsigned int irq;
+        unsigned char mac[ETH_ALEN];
+};
+#endif /* __ASM_SGI_SEEQ_H */
diff --git a/include/asm-mips/sgi/wd.h b/include/asm-mips/sgi/wd.h
new file mode 100644
index 000000000000..0d6c3a4da891
--- /dev/null
+++ b/include/asm-mips/sgi/wd.h
@@ -0,0 +1,20 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 by Ralf Baechle
+ */
+#ifndef __ASM_SGI_WD_H
+#define __ASM_SGI_WD_H
+#include <asm/sgi/hpc3.h>
+struct sgiwd93_platform_data {
+        unsigned int unit;
+        unsigned int irq;
+        struct hpc3_scsiregs *hregs;
+        unsigned char *wdregs;
+};
+#endif /* __ASM_SGI_WD_H */
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 3713d256d369..bb0b289dbc9e 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -464,7 +464,10 @@ static inline unsigned long __cmpxchg_local(volatile void * ptr,
 extern void set_handler (unsigned long offset, void *addr, unsigned long len);
 extern void set_uncached_handler (unsigned long offset, void *addr, unsigned long len);
-extern void *set_vi_handler (int n, void *addr);
+typedef void (*vi_handler_t)(void);
+extern void *set_vi_handler (int n, vi_handler_t addr);
 extern void *set_except_vector(int n, void *addr);
 extern unsigned long ebase;
 extern void per_cpu_trap_init(void);
diff --git a/include/asm-parisc/poll.h b/include/asm-parisc/poll.h
index 20e4d03c74cb..c98509d3149e 100644
--- a/include/asm-parisc/poll.h
+++ b/include/asm-parisc/poll.h
@@ -1,27 +1 @@
-#ifndef __PARISC_POLL_H
+#include <asm-generic/poll.h>
-#define __PARISC_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h
index 9e4dd98eb220..a7b60bf639e0 100644
--- a/include/asm-powerpc/hw_irq.h
+++ b/include/asm-powerpc/hw_irq.h
@@ -48,8 +48,15 @@ extern void iseries_handle_interrupts(void);
 #define irqs_disabled()         (local_get_flags() == 0)
-#define hard_irq_enable()       __mtmsrd(mfmsr() | MSR_EE, 1)
+#define __hard_irq_enable()     __mtmsrd(mfmsr() | MSR_EE, 1)
-#define hard_irq_disable()      __mtmsrd(mfmsr() & ~MSR_EE, 1)
+#define __hard_irq_disable()    __mtmsrd(mfmsr() & ~MSR_EE, 1)
+#define  hard_irq_disable()                     \
+        do {                                    \
+                __hard_irq_disable();           \
+                get_paca()->soft_enabled = 0;   \
+                get_paca()->hard_enabled = 0;   \
+        } while(0)
 #else
diff --git a/include/asm-powerpc/poll.h b/include/asm-powerpc/poll.h
index 9c7d12631033..c98509d3149e 100644
--- a/include/asm-powerpc/poll.h
+++ b/include/asm-powerpc/poll.h
@@ -1,24 +1 @@
-#ifndef _ASM_POWERPC_POLL_H
+#include <asm-generic/poll.h>
-#define _ASM_POWERPC_POLL_H
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif  /* _ASM_POWERPC_POLL_H */
diff --git a/include/asm-s390/poll.h b/include/asm-s390/poll.h
index 6f7f65ac7d27..c98509d3149e 100644
--- a/include/asm-s390/poll.h
+++ b/include/asm-s390/poll.h
@@ -1,35 +1 @@
-/*
+#include <asm-generic/poll.h>
- *  include/asm-s390/poll.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/poll.h"
- */
-#ifndef __S390_POLL_H
-#define __S390_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-sh/poll.h b/include/asm-sh/poll.h
index dbca9b32f4a6..c98509d3149e 100644
--- a/include/asm-sh/poll.h
+++ b/include/asm-sh/poll.h
@@ -1,27 +1 @@
-#ifndef __ASM_SH_POLL_H
+#include <asm-generic/poll.h>
-#define __ASM_SH_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif /* __ASM_SH_POLL_H */
diff --git a/include/asm-sh64/poll.h b/include/asm-sh64/poll.h
index 3a6cbad08d28..ca2950267c53 100644
--- a/include/asm-sh64/poll.h
+++ b/include/asm-sh64/poll.h
@@ -1,37 +1,8 @@
 #ifndef __ASM_SH64_POLL_H
 #define __ASM_SH64_POLL_H
-/*
+#include <asm-generic/poll.h>
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/poll.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-/* These are specified by iBCS2 */
+#undef POLLREMOVE
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
 #endif /* __ASM_SH64_POLL_H */
diff --git a/include/asm-sparc/poll.h b/include/asm-sparc/poll.h
index 26f13fb35497..091d3ad2e830 100644
--- a/include/asm-sparc/poll.h
+++ b/include/asm-sparc/poll.h
@@ -1,24 +1,12 @@
 #ifndef __SPARC_POLL_H
 #define __SPARC_POLL_H
-#define POLLIN            1
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
 #define POLLMSG         512
 #define POLLREMOVE      1024
 #define POLLRDHUP       2048
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
 #endif
diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h
index ab6b0d1bb4ad..ebeeb3816c40 100644
--- a/include/asm-sparc64/poll.h
+++ b/include/asm-sparc64/poll.h
@@ -1,24 +1,12 @@
 #ifndef __SPARC64_POLL_H
 #define __SPARC64_POLL_H
-#define POLLIN            1
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
 #define POLLMSG         512
 #define POLLREMOVE      1024
 #define POLLRDHUP       2048
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
 #endif
diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h
index 261e2f4528f6..18a13ba74605 100644
--- a/include/asm-um/thread_info.h
+++ b/include/asm-um/thread_info.h
@@ -22,6 +22,7 @@ struct thread_info {
                                                   0-0xBFFFFFFF for user
                                                   0-0xFFFFFFFF for kernel */
        struct restart_block    restart_block;
+        struct thread_info      *real_thread;    /* Points to non-IRQ stack */
 };
 #define INIT_THREAD_INFO(tsk)                   \
@@ -35,6 +36,7 @@ struct thread_info {
        .restart_block =  {                     \
                .fn =  do_no_restart_syscall,   \
        },                                      \
+        .real_thread = NULL,                    \
 }
 #define init_thread_info        (init_thread_union.thread_info)
diff --git a/include/asm-v850/poll.h b/include/asm-v850/poll.h
index c10176c2c28f..803cad0b9b59 100644
--- a/include/asm-v850/poll.h
+++ b/include/asm-v850/poll.h
@@ -1,24 +1,9 @@
 #ifndef __V850_POLL_H__
 #define __V850_POLL_H__
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-#define POLLRDNORM      0x0040
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      0x0080
 #define POLLWRBAND      0x0100
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
 #endif /* __V850_POLL_H__ */
diff --git a/include/asm-x86_64/alternative.h b/include/asm-x86_64/alternative.h
index a09fe85c268e..a09427640764 100644
--- a/include/asm-x86_64/alternative.h
+++ b/include/asm-x86_64/alternative.h
@@ -103,6 +103,12 @@ static inline void alternatives_smp_switch(int smp) {}
                      ".previous" : output : [feat] "i" (feature), ##input)
 /*
+ * use this macro(s) if you need more than one output parameter
+ * in alternative_io
+ */
+#define ASM_OUTPUT2(a, b) a, b
+/*
 * Alternative inline assembly for SMP.
 *
 * The LOCK_PREFIX macro defined here replaces the LOCK and
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
index dee632fa457d..e327c830da0c 100644
--- a/include/asm-x86_64/page.h
+++ b/include/asm-x86_64/page.h
@@ -80,6 +80,15 @@ extern unsigned long phys_base;
 #define __PHYSICAL_START        CONFIG_PHYSICAL_START
 #define __KERNEL_ALIGN          0x200000
+/*
+ * Make sure kernel is aligned to 2MB address. Catching it at compile
+ * time is better. Change your config file and compile the kernel
+ * for a 2MB aligned address (CONFIG_PHYSICAL_START)
+ */
+#if (CONFIG_PHYSICAL_START % __KERNEL_ALIGN) != 0
+#error "CONFIG_PHYSICAL_START must be a multiple of 2MB"
+#endif
 #define __START_KERNEL          (__START_KERNEL_map + __PHYSICAL_START)
 #define __START_KERNEL_map      _AC(0xffffffff80000000, UL)
 #define __PAGE_OFFSET           _AC(0xffff810000000000, UL)
diff --git a/include/asm-x86_64/poll.h b/include/asm-x86_64/poll.h
index c0475a9d8bb8..c98509d3149e 100644
--- a/include/asm-x86_64/poll.h
+++ b/include/asm-x86_64/poll.h
@@ -1,27 +1 @@
-#ifndef __x86_64_POLL_H
+#include <asm-generic/poll.h>
-#define __x86_64_POLL_H
-/* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
-#define POLLWRNORM      0x0100
-#define POLLWRBAND      0x0200
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-#endif
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index 595703949df3..ae1ed05f2814 100644
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -621,6 +621,15 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice)
 __SYSCALL(__NR_move_pages, sys_move_pages)
 #define __NR_utimensat          280
 __SYSCALL(__NR_utimensat, sys_utimensat)
+#define __IGNORE_getcpu         /* implemented as a vsyscall */
+#define __NR_epoll_pwait        281
+__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
+#define __NR_signalfd           282
+__SYSCALL(__NR_signalfd, sys_signalfd)
+#define __NR_timerfd            282
+__SYSCALL(__NR_timerfd, sys_timerfd)
+#define __NR_eventfd            283
+__SYSCALL(__NR_eventfd, sys_eventfd)
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-xtensa/poll.h b/include/asm-xtensa/poll.h
index 6fd94773e866..9d2d5993f068 100644
--- a/include/asm-xtensa/poll.h
+++ b/include/asm-xtensa/poll.h
@@ -11,28 +11,10 @@
 #ifndef _XTENSA_POLL_H
 #define _XTENSA_POLL_H
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
 #define POLLWRNORM      POLLOUT
 #define POLLWRBAND      0x0100
-#define POLLMSG         0x0400
 #define POLLREMOVE      0x0800
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
 #endif /* _XTENSA_POLL_H */
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 94cc04a143f2..bcd01f269f60 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -140,7 +140,6 @@ header-y += snmp.h
 header-y += sockios.h
 header-y += som.h
 header-y += sound.h
-header-y += synclink.h
 header-y += taskstats.h
 header-y += telephony.h
 header-y += termios.h
@@ -191,6 +190,7 @@ unifdef-y += errno.h
 unifdef-y += errqueue.h
 unifdef-y += ethtool.h
 unifdef-y += eventpoll.h
+unifdef-y += signalfd.h
 unifdef-y += ext2_fs.h
 unifdef-y += ext3_fs.h
 unifdef-y += fb.h
@@ -320,6 +320,7 @@ unifdef-y += sonypi.h
 unifdef-y += soundcard.h
 unifdef-y += stat.h
 unifdef-y += stddef.h
+unifdef-y += synclink.h
 unifdef-y += sysctl.h
 unifdef-y += tcp.h
 unifdef-y += time.h
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 43dc2ebfaa0e..b903fc02bdb7 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -119,6 +119,12 @@ struct kiocb {
        struct list_head        ki_list;        /* the aio core uses this
                                                 * for cancellation */
+        /*
+         * If the aio_resfd field of the userspace iocb is not zero,
+         * this is the underlying file* to deliver event to.
+         */
+        struct file             *ki_eventfd;
 };
 #define is_sync_kiocb(iocb)     ((iocb)->ki_key == KIOCB_SYNC_KEY)
diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h
index e3ca0a485cc6..9e0172931315 100644
--- a/include/linux/aio_abi.h
+++ b/include/linux/aio_abi.h
@@ -45,6 +45,14 @@ enum {
        IOCB_CMD_PWRITEV = 8,
 };
+/*
+ * Valid flags for the "aio_flags" member of the "struct iocb".
+ *
+ * IOCB_FLAG_RESFD - Set if the "aio_resfd" member of the "struct iocb"
+ *                   is valid.
+ */
+#define IOCB_FLAG_RESFD         (1 << 0)
 /* read() from /dev/aio returns these structures. */
 struct io_event {
        __u64           data;           /* the data field from the iocb */
@@ -84,7 +92,15 @@ struct iocb {
        /* extra parameters */
        __u64   aio_reserved2;  /* TODO: use this for a (struct sigevent *) */
-        __u64   aio_reserved3;
+        /* flags for the "struct iocb" */
+        __u32   aio_flags;
+        /*
+         * if the IOCB_FLAG_RESFD flag of "aio_flags" is set, this is an
+         * eventfd to signal AIO readiness to
+         */
+        __u32   aio_resfd;
 }; /* 64 bytes */
 #undef IFBIG
diff --git a/include/linux/anon_inodes.h b/include/linux/anon_inodes.h
new file mode 100644
index 000000000000..b2e1ba325b9a
--- /dev/null
+++ b/include/linux/anon_inodes.h
@@ -0,0 +1,16 @@
+/*
+ *  include/linux/anon_inodes.h
+ *
+ *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+#ifndef _LINUX_ANON_INODES_H
+#define _LINUX_ANON_INODES_H
+int anon_inode_getfd(int *pfd, struct inode **pinode, struct file **pfile,
+                     const char *name, const struct file_operations *fops,
+                     void *priv);
+#endif /* _LINUX_ANON_INODES_H */
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 773e30df11ee..fccc6e50298a 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -91,6 +91,7 @@
 #define AUDIT_MQ_GETSETATTR     1315    /* POSIX MQ get/set attribute record type */
 #define AUDIT_KERNEL_OTHER      1316    /* For use by 3rd party modules */
 #define AUDIT_FD_PAIR           1317    /* audit record for pipe/socketpair */
+#define AUDIT_OBJ_PID           1318    /* ptrace target */
 #define AUDIT_AVC               1400    /* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR       1401    /* Internal SE Linux Errors */
@@ -111,6 +112,7 @@
 #define AUDIT_FIRST_KERN_ANOM_MSG   1700
 #define AUDIT_LAST_KERN_ANOM_MSG    1799
 #define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
+#define AUDIT_ANOM_ABEND            1701 /* Process ended abnormally */
 #define AUDIT_KERNEL            2000    /* Asynchronous audit record. NOT A REQUEST. */
@@ -148,6 +150,8 @@
 #define AUDIT_CLASS_READ_32 5
 #define AUDIT_CLASS_WRITE 6
 #define AUDIT_CLASS_WRITE_32 7
+#define AUDIT_CLASS_SIGNAL 8
+#define AUDIT_CLASS_SIGNAL_32 9
 /* This bitmask is used to validate user input.  It represents all bits that
 * are currently used in an audit field constant understood by the kernel.
@@ -337,6 +341,7 @@ struct mqstat;
 #define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS )
 extern int __init audit_register_class(int class, unsigned *list);
 extern int audit_classify_syscall(int abi, unsigned syscall);
+extern int audit_classify_arch(int arch);
 #ifdef CONFIG_AUDITSYSCALL
 /* These are defined in auditsc.c */
                                /* Public API */
@@ -351,7 +356,8 @@ extern void audit_putname(const char *name);
 extern void __audit_inode(const char *name, const struct inode *inode);
 extern void __audit_inode_child(const char *dname, const struct inode *inode,
                                const struct inode *parent);
-extern void __audit_inode_update(const struct inode *inode);
+extern void __audit_ptrace(struct task_struct *t);
 static inline int audit_dummy_context(void)
 {
        void *p = current->audit_context;
@@ -372,9 +378,12 @@ static inline void audit_inode_child(const char *dname,
        if (unlikely(!audit_dummy_context()))
                __audit_inode_child(dname, inode, parent);
 }
-static inline void audit_inode_update(const struct inode *inode) {
+void audit_core_dumps(long signr);
+static inline void audit_ptrace(struct task_struct *t)
+{
        if (unlikely(!audit_dummy_context()))
-                __audit_inode_update(inode);
+                __audit_ptrace(t);
 }
                                /* Private API (for audit.c only) */
@@ -447,6 +456,7 @@ static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
        return 0;
 }
 extern int audit_n_rules;
+extern int audit_signals;
 #else
 #define audit_alloc(t) ({ 0; })
 #define audit_free(t) do { ; } while (0)
@@ -457,10 +467,9 @@ extern int audit_n_rules;
 #define audit_putname(n) do { ; } while (0)
 #define __audit_inode(n,i) do { ; } while (0)
 #define __audit_inode_child(d,i,p) do { ; } while (0)
-#define __audit_inode_update(i) do { ; } while (0)
 #define audit_inode(n,i) do { ; } while (0)
 #define audit_inode_child(d,i,p) do { ; } while (0)
-#define audit_inode_update(i) do { ; } while (0)
+#define audit_core_dumps(i) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
 #define audit_get_loginuid(c) ({ -1; })
 #define audit_log_task_context(b) do { ; } while (0)
@@ -477,7 +486,9 @@ extern int audit_n_rules;
 #define audit_mq_timedreceive(d,l,p,t) ({ 0; })
 #define audit_mq_notify(d,n) ({ 0; })
 #define audit_mq_getsetattr(d,s) ({ 0; })
+#define audit_ptrace(t) ((void)0)
 #define audit_n_rules 0
+#define audit_signals 0
 #endif
 #ifdef CONFIG_AUDIT
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 70a157a130bb..636502c02734 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -225,6 +225,11 @@ static inline int compat_timespec_compare(struct compat_timespec *lhs,
        return lhs->tv_nsec - rhs->tv_nsec;
 }
+extern int get_compat_itimerspec(struct itimerspec *dst,
+                                 const struct compat_itimerspec __user *src);
+extern int put_compat_itimerspec(struct compat_itimerspec __user *dst,
+                                 const struct itimerspec *src);
 asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
 extern int compat_printk(const char *fmt, ...);
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
new file mode 100644
index 000000000000..0d6ecc60b94d
--- /dev/null
+++ b/include/linux/eventfd.h
@@ -0,0 +1,29 @@
+/*
+ *  include/linux/eventfd.h
+ *
+ *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+#ifndef _LINUX_EVENTFD_H
+#define _LINUX_EVENTFD_H
+#ifdef __KERNEL__
+#ifdef CONFIG_EVENTFD
+struct file *eventfd_fget(int fd);
+int eventfd_signal(struct file *file, int n);
+#else /* CONFIG_EVENTFD */
+#define eventfd_fget(fd) ERR_PTR(-ENOSYS)
+#define eventfd_signal(f, n) 0
+#endif /* CONFIG_EVENTFD */
+#endif /* __KERNEL__ */
+#endif /* _LINUX_EVENTFD_H */
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index f589559cf070..4c03ee353e78 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -434,6 +434,10 @@ static inline struct block_device *bdget_disk(struct gendisk *disk, int index)
 #endif
-#endif
+#else /* CONFIG_BLOCK */
+static inline void printk_all_partitions(void) { }
+#endif /* CONFIG_BLOCK */
 #endif
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 37076b116ed0..827ee748fd4c 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -275,6 +275,7 @@ struct hid_item {
 #define HID_QUIRK_LOGITECH_DESCRIPTOR           0x00100000
 #define HID_QUIRK_DUPLICATE_USAGES              0x00200000
 #define HID_QUIRK_RESET_LEDS                    0x00400000
+#define HID_QUIRK_SWAPPED_MIN_MAX               0x00800000
 /*
 * This is the global environment of the parser. This information is
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 45170b2fa253..276ccaa2670c 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -65,9 +65,9 @@
        .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
        .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
        .rlim           = INIT_RLIMITS,                                 \
-        .pgrp           = 1,                                            \
+        .pgrp           = 0,                                            \
        .tty_old_pgrp   = NULL,                                         \
-        { .__session      = 1},                                         \
+        { .__session      = 0},                                         \
 }
 extern struct nsproxy init_nsproxy;
@@ -84,10 +84,33 @@ extern struct nsproxy init_nsproxy;
        .count          = ATOMIC_INIT(1),                               \
        .action         = { { { .sa_handler = NULL, } }, },             \
        .siglock        = __SPIN_LOCK_UNLOCKED(sighand.siglock),        \
+        .signalfd_list  = LIST_HEAD_INIT(sighand.signalfd_list),        \
 }
 extern struct group_info init_groups;
+#define INIT_STRUCT_PID {                                               \
+        .count          = ATOMIC_INIT(1),                               \
+        .nr             = 0,                                            \
+        /* Don't put this struct pid in pid_hash */                     \
+        .pid_chain      = { .next = NULL, .pprev = NULL },              \
+        .tasks          = {                                             \
+                { .first = &init_task.pids[PIDTYPE_PID].node },         \
+                { .first = &init_task.pids[PIDTYPE_PGID].node },        \
+                { .first = &init_task.pids[PIDTYPE_SID].node },         \
+        },                                                              \
+        .rcu            = RCU_HEAD_INIT,                                \
+}
+#define INIT_PID_LINK(type)                                     \
+{                                                               \
+        .node = {                                               \
+                .next = NULL,                                   \
+                .pprev = &init_struct_pid.tasks[type].first,    \
+        },                                                      \
+        .pid = &init_struct_pid,                                \
+}
 /*
 *  INIT_TASK is used to set up the first task table, touch at
 * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -139,6 +162,11 @@ extern struct group_info init_groups;
        .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
        .fs_excl        = ATOMIC_INIT(0),                               \
        .pi_lock        = __SPIN_LOCK_UNLOCKED(tsk.pi_lock),            \
+        .pids = {                                                       \
+                [PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),            \
+                [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID),           \
+                [PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),            \
+        },                                                              \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
 }
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index f7b01b9a35b3..5323f6275854 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -241,6 +241,16 @@ static inline void __deprecated save_and_cli(unsigned long *x)
 #define save_and_cli(x) save_and_cli(&x)
 #endif /* CONFIG_SMP */
+/* Some architectures might implement lazy enabling/disabling of
+ * interrupts. In some cases, such as stop_machine, we might want
+ * to ensure that after a local_irq_disable(), interrupts have
+ * really been disabled in hardware. Such architectures need to
+ * implement the following hook.
+ */
+#ifndef hard_irq_disable
+#define hard_irq_disable()      do { } while(0)
+#endif
 /* PLEASE, avoid to allocate new softirqs, if you need not _really_ high
   frequency threaded job scheduling. For almost all the purposes
   tasklets are more than enough. F.e. all serial device BHs et
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 8645181fca0f..eec0d13169a6 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -213,6 +213,17 @@ extern enum system_states {
 extern void dump_stack(void);
+enum {
+        DUMP_PREFIX_NONE,
+        DUMP_PREFIX_ADDRESS,
+        DUMP_PREFIX_OFFSET
+};
+extern void hex_dump_to_buffer(const void *buf, size_t len, char *linebuf,
+                                size_t linebuflen);
+extern void print_hex_dump(const char *level, int prefix_type,
+                                void *buf, size_t len);
+#define hex_asc(x)      "0123456789abcdef"[x]
 #ifdef DEBUG
 /* If you are writing a driver, please use dev_dbg instead */
 #define pr_debug(fmt,arg...) \
diff --git a/include/linux/magic.h b/include/linux/magic.h
index a9c6567fe70c..9d713c03e3da 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -14,6 +14,7 @@
 #define ISOFS_SUPER_MAGIC       0x9660
 #define JFFS2_SUPER_MAGIC       0x72b6
 #define KVMFS_SUPER_MAGIC       0x19700426
+#define ANON_INODE_FS_MAGIC     0x09041934
 #define MINIX_SUPER_MAGIC       0x137F          /* original minix fs */
 #define MINIX_SUPER_MAGIC2      0x138F          /* minix fs, 30 char names */
diff --git a/include/linux/module.h b/include/linux/module.h
index 792d483c9af7..e6e0f86ef5fc 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -124,7 +124,7 @@ extern struct module __this_module;
 */
 #define MODULE_LICENSE(_license) MODULE_INFO(license, _license)
-/* Author, ideally of form NAME <EMAIL>[, NAME <EMAIL>]*[ and NAME <EMAIL>] */
+/* Author, ideally of form NAME[, NAME]*[ and NAME] */
 #define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
  
 /* What your module does. */
diff --git a/include/linux/mpage.h b/include/linux/mpage.h
index cc5fb75af78a..068a0c9946af 100644
--- a/include/linux/mpage.h
+++ b/include/linux/mpage.h
@@ -12,7 +12,6 @@
 #ifdef CONFIG_BLOCK
 struct writeback_control;
-typedef int (writepage_t)(struct page *page, struct writeback_control *wbc);
 int mpage_readpages(struct address_space *mapping, struct list_head *pages,
                                unsigned nr_pages, get_block_t get_block);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 30446222b396..f671cd2f133f 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -467,6 +467,8 @@ struct net_device
        /* device index hash chain */
        struct hlist_node       index_hlist;
+        struct net_device       *link_watch_next;
        /* register/unregister state machine */
        enum { NETREG_UNINITIALIZED=0,
               NETREG_REGISTERED,       /* completed register_netdevice */
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 022edfa97ed9..7e733a6ba4f6 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -54,6 +54,14 @@ struct xt_entry_target
        unsigned char data[0];
 };
+#define XT_TARGET_INIT(__name, __size)                                         \
+{                                                                              \
+        .target.u.user = {                                                     \
+                .target_size    = XT_ALIGN(__size),                            \
+                .name           = __name,                                      \
+        },                                                                     \
+}
 struct xt_standard_target
 {
        struct xt_entry_target target;
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index 24c8786d12e9..584cd1b18f12 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -238,6 +238,47 @@ static __inline__ struct arpt_entry_target *arpt_get_target(struct arpt_entry *e
 */
 #ifdef __KERNEL__
+/* Standard entry. */
+struct arpt_standard
+{
+        struct arpt_entry entry;
+        struct arpt_standard_target target;
+};
+struct arpt_error_target
+{
+        struct arpt_entry_target target;
+        char errorname[ARPT_FUNCTION_MAXNAMELEN];
+};
+struct arpt_error
+{
+        struct arpt_entry entry;
+        struct arpt_error_target target;
+};
+#define ARPT_ENTRY_INIT(__size)                                                \
+{                                                                              \
+        .target_offset  = sizeof(struct arpt_entry),                           \
+        .next_offset    = (__size),                                            \
+}
+#define ARPT_STANDARD_INIT(__verdict)                                          \
+{                                                                              \
+        .entry          = ARPT_ENTRY_INIT(sizeof(struct arpt_standard)),       \
+        .target         = XT_TARGET_INIT(ARPT_STANDARD_TARGET,                 \
+                                         sizeof(struct arpt_standard_target)), \
+        .target.verdict = -(__verdict) - 1,                                    \
+}
+#define ARPT_ERROR_INIT                                                        \
+{                                                                              \
+        .entry          = ARPT_ENTRY_INIT(sizeof(struct arpt_error)),          \
+        .target         = XT_TARGET_INIT(ARPT_ERROR_TARGET,                    \
+                                         sizeof(struct arpt_error_target)),    \
+        .target.errorname = "ERROR",                                           \
+}
 #define arpt_register_target(tgt)       \
 ({      (tgt)->family = NF_ARP;         \
        xt_register_target(tgt); })
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 9527296595cd..2f46dd728ee1 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -295,6 +295,28 @@ struct ipt_error
        struct ipt_error_target target;
 };
+#define IPT_ENTRY_INIT(__size)                                                 \
+{                                                                              \
+        .target_offset  = sizeof(struct ipt_entry),                            \
+        .next_offset    = (__size),                                            \
+}
+#define IPT_STANDARD_INIT(__verdict)                                           \
+{                                                                              \
+        .entry          = IPT_ENTRY_INIT(sizeof(struct ipt_standard)),         \
+        .target         = XT_TARGET_INIT(IPT_STANDARD_TARGET,                  \
+                                         sizeof(struct xt_standard_target)),   \
+        .target.verdict = -(__verdict) - 1,                                    \
+}
+#define IPT_ERROR_INIT                                                         \
+{                                                                              \
+        .entry          = IPT_ENTRY_INIT(sizeof(struct ipt_error)),            \
+        .target         = XT_TARGET_INIT(IPT_ERROR_TARGET,                     \
+                                         sizeof(struct ipt_error_target)),     \
+        .target.errorname = "ERROR",                                           \
+}
 extern unsigned int ipt_do_table(struct sk_buff **pskb,
                                 unsigned int hook,
                                 const struct net_device *in,
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 61aa10412fc8..4686f8342cbd 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -123,6 +123,28 @@ struct ip6t_error
        struct ip6t_error_target target;
 };
+#define IP6T_ENTRY_INIT(__size)                                                \
+{                                                                              \
+        .target_offset  = sizeof(struct ip6t_entry),                           \
+        .next_offset    = (__size),                                            \
+}
+#define IP6T_STANDARD_INIT(__verdict)                                          \
+{                                                                              \
+        .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_standard)),       \
+        .target         = XT_TARGET_INIT(IP6T_STANDARD_TARGET,                 \
+                                         sizeof(struct ip6t_standard_target)), \
+        .target.verdict = -(__verdict) - 1,                                    \
+}
+#define IP6T_ERROR_INIT                                                        \
+{                                                                              \
+        .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_error)),          \
+        .target         = XT_TARGET_INIT(IP6T_ERROR_TARGET,                    \
+                                         sizeof(struct ip6t_error_target)),    \
+        .target.errorname = "ERROR",                                           \
+}
 /*
 * New IP firewall options for [gs]etsockopt at the RAW IP level.
 * Unlike BSD Linux inherits IP options so you don't have to use
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 2ac27f9997dd..1e0e4e3423a6 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -51,6 +51,8 @@ struct pid
        struct rcu_head rcu;
 };
+extern struct pid init_struct_pid;
 struct pid_link
 {
        struct hlist_node node;
@@ -76,8 +78,7 @@ extern struct pid *get_task_pid(struct task_struct *task, enum pid_type type);
 * write-held.
 */
 extern int FASTCALL(attach_pid(struct task_struct *task,
-                                enum pid_type type, int nr));
+                                enum pid_type type, struct pid *pid));
 extern void FASTCALL(detach_pid(struct task_struct *task, enum pid_type));
 extern void FASTCALL(transfer_pid(struct task_struct *old,
                                  struct task_struct *new, enum pid_type));
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 17b72d88c4cb..a81897e2a244 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -88,6 +88,7 @@ struct sched_param {
 struct exec_domain;
 struct futex_pi_state;
+struct bio;
 /*
 * List of flags we want to share for kernel threads,
@@ -391,6 +392,7 @@ struct sighand_struct {
        atomic_t                count;
        struct k_sigaction      action[_NSIG];
        spinlock_t              siglock;
+        struct list_head        signalfd_list;
 };
 struct pacct_struct {
@@ -469,6 +471,7 @@ struct signal_struct {
        cputime_t utime, stime, cutime, cstime;
        unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
        unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
+        unsigned long inblock, oublock, cinblock, coublock;
        /*
         * Cumulative ns of scheduled CPU time for dead threads in the
@@ -1014,6 +1017,9 @@ struct task_struct {
 /* journalling filesystem info */
        void *journal_info;
+/* stacked block device info */
+        struct bio *bio_list, **bio_tail;
 /* VM state */
        struct reclaim_state *reclaim_state;
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 3fa0fab4a04b..9a5eac508e5e 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -233,6 +233,7 @@ static inline int valid_signal(unsigned long sig)
        return sig <= _NSIG ? 1 : 0;
 }
+extern int next_signal(struct sigpending *pending, sigset_t *mask);
 extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *);
 extern long do_sigpending(void __user *, unsigned long);
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
new file mode 100644
index 000000000000..510429495690
--- /dev/null
+++ b/include/linux/signalfd.h
@@ -0,0 +1,97 @@
+/*
+ *  include/linux/signalfd.h
+ *
+ *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+#ifndef _LINUX_SIGNALFD_H
+#define _LINUX_SIGNALFD_H
+struct signalfd_siginfo {
+        __u32 signo;
+        __s32 err;
+        __s32 code;
+        __u32 pid;
+        __u32 uid;
+        __s32 fd;
+        __u32 tid;
+        __u32 band;
+        __u32 overrun;
+        __u32 trapno;
+        __s32 status;
+        __s32 svint;
+        __u64 svptr;
+        __u64 utime;
+        __u64 stime;
+        __u64 addr;
+        /*
+         * Pad strcture to 128 bytes. Remember to update the
+         * pad size when you add new memebers. We use a fixed
+         * size structure to avoid compatibility problems with
+         * future versions, and we leave extra space for additional
+         * members. We use fixed size members because this strcture
+         * comes out of a read(2) and we really don't want to have
+         * a compat on read(2).
+         */
+        __u8 __pad[48];
+};
+#ifdef __KERNEL__
+#ifdef CONFIG_SIGNALFD
+/*
+ * Deliver the signal to listening signalfd. This must be called
+ * with the sighand lock held. Same are the following that end up
+ * calling signalfd_deliver().
+ */
+void signalfd_deliver(struct task_struct *tsk, int sig);
+/*
+ * No need to fall inside signalfd_deliver() if no signal listeners
+ * are available.
+ */
+static inline void signalfd_notify(struct task_struct *tsk, int sig)
+{
+        if (unlikely(!list_empty(&tsk->sighand->signalfd_list)))
+                signalfd_deliver(tsk, sig);
+}
+/*
+ * The signal -1 is used to notify the signalfd that the sighand
+ * is on its way to be detached.
+ */
+static inline void signalfd_detach_locked(struct task_struct *tsk)
+{
+        if (unlikely(!list_empty(&tsk->sighand->signalfd_list)))
+                signalfd_deliver(tsk, -1);
+}
+static inline void signalfd_detach(struct task_struct *tsk)
+{
+        struct sighand_struct *sighand = tsk->sighand;
+        if (unlikely(!list_empty(&sighand->signalfd_list))) {
+                spin_lock_irq(&sighand->siglock);
+                signalfd_deliver(tsk, -1);
+                spin_unlock_irq(&sighand->siglock);
+        }
+}
+#else /* CONFIG_SIGNALFD */
+#define signalfd_deliver(t, s) do { } while (0)
+#define signalfd_notify(t, s) do { } while (0)
+#define signalfd_detach_locked(t) do { } while (0)
+#define signalfd_detach(t) do { } while (0)
+#endif /* CONFIG_SIGNALFD */
+#endif /* __KERNEL__ */
+#endif /* _LINUX_SIGNALFD_H */
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index c8b042667af1..5562fbf72095 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -291,4 +291,28 @@ struct gpio_desc {
 #define MGSL_IOCGGPIO           _IOR(MGSL_MAGIC_IOC,17,struct gpio_desc)
 #define MGSL_IOCWAITGPIO        _IOWR(MGSL_MAGIC_IOC,18,struct gpio_desc)
+#ifdef __KERNEL__
+/* provide 32 bit ioctl compatibility on 64 bit systems */
+#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+struct MGSL_PARAMS32 {
+        compat_ulong_t  mode;
+        unsigned char   loopback;
+        unsigned short  flags;
+        unsigned char   encoding;
+        compat_ulong_t  clock_speed;
+        unsigned char   addr_filter;
+        unsigned short  crc_type;
+        unsigned char   preamble_length;
+        unsigned char   preamble;
+        compat_ulong_t  data_rate;
+        unsigned char   data_bits;
+        unsigned char   stop_bits;
+        unsigned char   parity;
+};
+#define MGSL_IOCSPARAMS32 _IOW(MGSL_MAGIC_IOC,0,struct MGSL_PARAMS32)
+#define MGSL_IOCGPARAMS32 _IOR(MGSL_MAGIC_IOC,1,struct MGSL_PARAMS32)
+#endif
+#endif
 #endif /* _SYNCLINK_H_ */
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 3139f4412297..b02070eac422 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -604,6 +604,10 @@ asmlinkage long sys_get_robust_list(int pid,
 asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
                                    size_t len);
 asmlinkage long sys_getcpu(unsigned __user *cpu, unsigned __user *node, struct getcpu_cache __user *cache);
+asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemask);
+asmlinkage long sys_timerfd(int ufd, int clockid, int flags,
+                            const struct itimerspec __user *utmr);
+asmlinkage long sys_eventfd(unsigned int count);
 int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
diff --git a/include/linux/task_io_accounting_ops.h b/include/linux/task_io_accounting_ops.h
index df2a319106b2..1218733ec6b5 100644
--- a/include/linux/task_io_accounting_ops.h
+++ b/include/linux/task_io_accounting_ops.h
@@ -10,11 +10,29 @@ static inline void task_io_account_read(size_t bytes)
        current->ioac.read_bytes += bytes;
 }
+/*
+ * We approximate number of blocks, because we account bytes only.
+ * A 'block' is 512 bytes
+ */
+static inline unsigned long task_io_get_inblock(const struct task_struct *p)
+{
+        return p->ioac.read_bytes >> 9;
+}
 static inline void task_io_account_write(size_t bytes)
 {
        current->ioac.write_bytes += bytes;
 }
+/*
+ * We approximate number of blocks, because we account bytes only.
+ * A 'block' is 512 bytes
+ */
+static inline unsigned long task_io_get_oublock(const struct task_struct *p)
+{
+        return p->ioac.write_bytes >> 9;
+}
 static inline void task_io_account_cancelled_write(size_t bytes)
 {
        current->ioac.cancelled_write_bytes += bytes;
@@ -31,10 +49,20 @@ static inline void task_io_account_read(size_t bytes)
 {
 }
+static inline unsigned long task_io_get_inblock(const struct task_struct *p)
+{
+        return 0;
+}
 static inline void task_io_account_write(size_t bytes)
 {
 }
+static inline unsigned long task_io_get_oublock(const struct task_struct *p)
+{
+        return 0;
+}
 static inline void task_io_account_cancelled_write(size_t bytes)
 {
 }
diff --git a/include/linux/timerfd.h b/include/linux/timerfd.h
new file mode 100644
index 000000000000..cf2b10d75731
--- /dev/null
+++ b/include/linux/timerfd.h
@@ -0,0 +1,17 @@
+/*
+ *  include/linux/timerfd.h
+ *
+ *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+#ifndef _LINUX_TIMERFD_H
+#define _LINUX_TIMERFD_H
+#define TFD_TIMER_ABSTIME (1 << 0)
+#endif /* _LINUX_TIMERFD_H */
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 659487e3ebeb..85c95cd39bc3 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -52,6 +52,11 @@
 *      This routine allows the tty driver to implement
 *      device-specific ioctl's.  If the ioctl number passed in cmd
 *      is not recognized by the driver, it should return ENOIOCTLCMD.
+ *
+ * long (*compat_ioctl)(struct tty_struct *tty, struct file * file,
+ *                      unsigned int cmd, unsigned long arg);
+ *
+ *      implement ioctl processing for 32 bit process on 64 bit system
 * 
 * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
 *
@@ -132,6 +137,8 @@ struct tty_operations {
        int  (*chars_in_buffer)(struct tty_struct *tty);
        int  (*ioctl)(struct tty_struct *tty, struct file * file,
                    unsigned int cmd, unsigned long arg);
+        long (*compat_ioctl)(struct tty_struct *tty, struct file * file,
+                             unsigned int cmd, unsigned long arg);
        void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
        void (*throttle)(struct tty_struct * tty);
        void (*unthrottle)(struct tty_struct * tty);
@@ -193,6 +200,8 @@ struct tty_driver {
        int  (*chars_in_buffer)(struct tty_struct *tty);
        int  (*ioctl)(struct tty_struct *tty, struct file * file,
                    unsigned int cmd, unsigned long arg);
+        long (*compat_ioctl)(struct tty_struct *tty, struct file * file,
+                             unsigned int cmd, unsigned long arg);
        void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
        void (*throttle)(struct tty_struct * tty);
        void (*unthrottle)(struct tty_struct * tty);
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index d75932e27710..6226504d9108 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -59,6 +59,11 @@
 *      low-level driver can "grab" an ioctl request before the line
 *      discpline has a chance to see it.
 * 
+ * long (*compat_ioctl)(struct tty_struct * tty, struct file * file,
+ *                      unsigned int cmd, unsigned long arg);
+ *
+ *      Process ioctl calls from 32-bit process on 64-bit system
+ *
 * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
 *
 *      This function notifies the line discpline that a change has
@@ -118,6 +123,8 @@ struct tty_ldisc {
                         const unsigned char * buf, size_t nr); 
        int     (*ioctl)(struct tty_struct * tty, struct file * file,
                         unsigned int cmd, unsigned long arg);
+        long    (*compat_ioctl)(struct tty_struct * tty, struct file * file,
+                                unsigned int cmd, unsigned long arg);
        void    (*set_termios)(struct tty_struct *tty, struct ktermios * old);
        unsigned int (*poll)(struct tty_struct *, struct file *,
                             struct poll_table_struct *);
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index daa6c125f66e..050915b59576 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -111,9 +111,15 @@ balance_dirty_pages_ratelimited(struct address_space *mapping)
        balance_dirty_pages_ratelimited_nr(mapping, 1);
 }
+typedef int (*writepage_t)(struct page *page, struct writeback_control *wbc,
+                                void *data);
 int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0);
-extern int generic_writepages(struct address_space *mapping,
+int generic_writepages(struct address_space *mapping,
-                              struct writeback_control *wbc);
+                       struct writeback_control *wbc);
+int write_cache_pages(struct address_space *mapping,
+                      struct writeback_control *wbc, writepage_t writepage,
+                      void *data);
 int do_writepages(struct address_space *mapping, struct writeback_control *wbc);
 int sync_page_range(struct inode *inode, struct address_space *mapping,
                        loff_t pos, loff_t count);
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 1c6b8bd09b9a..4732432f8eb0 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -183,13 +183,6 @@ extern void nf_conntrack_hash_insert(struct nf_conn *ct);
 extern void nf_conntrack_flush(void);
-extern struct nf_conntrack_helper *
-nf_ct_helper_find_get( const struct nf_conntrack_tuple *tuple);
-extern void nf_ct_helper_put(struct nf_conntrack_helper *helper);
-extern struct nf_conntrack_helper *
-__nf_conntrack_helper_find_byname(const char *name);
 extern int nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse,
                                const struct nf_conntrack_tuple *orig);
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index f32f714e5d92..96a58d8e1d3f 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -56,9 +56,6 @@ struct nf_conntrack_l3proto
         */
        int (*new)(struct nf_conn *conntrack, const struct sk_buff *skb);
-        /* Called when a conntrack entry is destroyed */
-        void (*destroy)(struct nf_conn *conntrack);
        /*
         * Called before tracking. 
         *      *dataoff: offset of protocol header (TCP, UDP,...) in *pskb
diff --git a/include/net/netfilter/nf_nat_rule.h b/include/net/netfilter/nf_nat_rule.h
index e76565459ad9..f9743187d57f 100644
--- a/include/net/netfilter/nf_nat_rule.h
+++ b/include/net/netfilter/nf_nat_rule.h
@@ -10,16 +10,11 @@ extern int nf_nat_rule_find(struct sk_buff **pskb,
                            unsigned int hooknum,
                            const struct net_device *in,
                            const struct net_device *out,
-                            struct nf_conn *ct,
+                            struct nf_conn *ct);
-                            struct nf_nat_info *info);
 extern unsigned int
-alloc_null_binding(struct nf_conn *ct,
+alloc_null_binding(struct nf_conn *ct, unsigned int hooknum);
-                   struct nf_nat_info *info,
-                   unsigned int hooknum);
 extern unsigned int
-alloc_null_binding_confirmed(struct nf_conn *ct,
+alloc_null_binding_confirmed(struct nf_conn *ct, unsigned int hooknum);
-                             struct nf_nat_info *info,
-                             unsigned int hooknum);
 #endif /* _NF_NAT_RULE_H */
diff --git a/include/net/udp.h b/include/net/udp.h
index 98755ebaf163..496f89d45c8b 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -119,9 +119,16 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
 }
+struct udp_get_port_ops {
+        int (*saddr_cmp)(const struct sock *sk1, const struct sock *sk2);
+        int (*saddr_any)(const struct sock *sk);
+        unsigned int (*hash_port_and_rcv_saddr)(__u16 port,
+                                                const struct sock *sk);
+};
 /* net/ipv4/udp.c */
 extern int      udp_get_port(struct sock *sk, unsigned short snum,
-                             int (*saddr_cmp)(const struct sock *, const struct sock *));
+                             const struct udp_get_port_ops *ops);
 extern void     udp_err(struct sk_buff *, u32);
 extern int      udp_sendmsg(struct kiocb *iocb, struct sock *sk,
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 635b0eafca95..50b4b424d1ca 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -120,5 +120,5 @@ static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 extern void     udplite4_register(void);
 extern int      udplite_get_port(struct sock *sk, unsigned short snum,
-                        int (*scmp)(const struct sock *, const struct sock *));
+                                 const struct udp_get_port_ops *ops);
 #endif  /* _UDPLITE_H */
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
new file mode 100644
index 000000000000..4eea63761a3f
--- /dev/null
+++ b/include/video/atmel_lcdc.h
@@ -0,0 +1,196 @@
+/*
+ *  Header file for AT91/AT32 LCD Controller
+ *
+ *  Data structure and register user interface
+ *
+ *  Copyright (C) 2007 Atmel Corporation
+ *
+ * This program 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 program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ATMEL_LCDC_H__
+#define __ATMEL_LCDC_H__
+ /* LCD Controller info data structure */
+struct atmel_lcdfb_info {
+        spinlock_t              lock;
+        struct fb_info          *info;
+        void __iomem            *mmio;
+        unsigned long           irq_base;
+        unsigned int            guard_time;
+        struct platform_device  *pdev;
+        struct clk              *bus_clk;
+        struct clk              *lcdc_clk;
+        unsigned int            default_bpp;
+        unsigned int            default_lcdcon2;
+        unsigned int            default_dmacon;
+        void (*atmel_lcdfb_power_control)(int on);
+        struct fb_monspecs      *default_monspecs;
+        u32                     pseudo_palette[16];
+};
+#define ATMEL_LCDC_DMABADDR1    0x00
+#define ATMEL_LCDC_DMABADDR2    0x04
+#define ATMEL_LCDC_DMAFRMPT1    0x08
+#define ATMEL_LCDC_DMAFRMPT2    0x0c
+#define ATMEL_LCDC_DMAFRMADD1   0x10
+#define ATMEL_LCDC_DMAFRMADD2   0x14
+#define ATMEL_LCDC_DMAFRMCFG    0x18
+#define ATMEL_LCDC_FRSIZE       (0x7fffff <<  0)
+#define ATMEL_LCDC_BLENGTH_OFFSET       24
+#define ATMEL_LCDC_BLENGTH      (0x7f     << ATMEL_LCDC_BLENGTH_OFFSET)
+#define ATMEL_LCDC_DMACON       0x1c
+#define ATMEL_LCDC_DMAEN        (0x1 << 0)
+#define ATMEL_LCDC_DMARST       (0x1 << 1)
+#define ATMEL_LCDC_DMABUSY      (0x1 << 2)
+#define         ATMEL_LCDC_DMAUPDT      (0x1 << 3)
+#define         ATMEL_LCDC_DMA2DEN      (0x1 << 4)
+#define ATMEL_LCDC_DMA2DCFG     0x20
+#define         ATMEL_LCDC_ADDRINC_OFFSET       0
+#define         ATMEL_LCDC_ADDRINC              (0xffff)
+#define         ATMEL_LCDC_PIXELOFF_OFFSET      24
+#define         ATMEL_LCDC_PIXELOFF             (0x1f << 24)
+#define ATMEL_LCDC_LCDCON1      0x0800
+#define ATMEL_LCDC_BYPASS       (1     <<  0)
+#define ATMEL_LCDC_CLKVAL_OFFSET        12
+#define ATMEL_LCDC_CLKVAL       (0x1ff << ATMEL_LCDC_CLKVAL_OFFSET)
+#define ATMEL_LCDC_LINCNT       (0x7ff << 21)
+#define ATMEL_LCDC_LCDCON2      0x0804
+#define ATMEL_LCDC_DISTYPE      (3 << 0)
+#define         ATMEL_LCDC_DISTYPE_STNMONO      (0 << 0)
+#define         ATMEL_LCDC_DISTYPE_STNCOLOR     (1 << 0)
+#define         ATMEL_LCDC_DISTYPE_TFT          (2 << 0)
+#define ATMEL_LCDC_SCANMOD      (1 << 2)
+#define         ATMEL_LCDC_SCANMOD_SINGLE       (0 << 2)
+#define         ATMEL_LCDC_SCANMOD_DUAL         (1 << 2)
+#define ATMEL_LCDC_IFWIDTH      (3 << 3)
+#define         ATMEL_LCDC_IFWIDTH_4            (0 << 3)
+#define         ATMEL_LCDC_IFWIDTH_8            (1 << 3)
+#define         ATMEL_LCDC_IFWIDTH_16           (2 << 3)
+#define ATMEL_LCDC_PIXELSIZE    (7 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_1          (0 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_2          (1 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_4          (2 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_8          (3 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_16         (4 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_24         (5 << 5)
+#define         ATMEL_LCDC_PIXELSIZE_32         (6 << 5)
+#define ATMEL_LCDC_INVVD        (1 << 8)
+#define         ATMEL_LCDC_INVVD_NORMAL         (0 << 8)
+#define         ATMEL_LCDC_INVVD_INVERTED       (1 << 8)
+#define ATMEL_LCDC_INVFRAME     (1 << 9 )
+#define         ATMEL_LCDC_INVFRAME_NORMAL      (0 << 9)
+#define         ATMEL_LCDC_INVFRAME_INVERTED    (1 << 9)
+#define ATMEL_LCDC_INVLINE      (1 << 10)
+#define         ATMEL_LCDC_INVLINE_NORMAL       (0 << 10)
+#define         ATMEL_LCDC_INVLINE_INVERTED     (1 << 10)
+#define ATMEL_LCDC_INVCLK       (1 << 11)
+#define         ATMEL_LCDC_INVCLK_NORMAL        (0 << 11)
+#define         ATMEL_LCDC_INVCLK_INVERTED      (1 << 11)
+#define ATMEL_LCDC_INVDVAL      (1 << 12)
+#define         ATMEL_LCDC_INVDVAL_NORMAL       (0 << 12)
+#define         ATMEL_LCDC_INVDVAL_INVERTED     (1 << 12)
+#define ATMEL_LCDC_CLKMOD       (1 << 15)
+#define         ATMEL_LCDC_CLKMOD_ACTIVEDISPLAY (0 << 15)
+#define         ATMEL_LCDC_CLKMOD_ALWAYSACTIVE  (1 << 15)
+#define ATMEL_LCDC_MEMOR        (1 << 31)
+#define         ATMEL_LCDC_MEMOR_BIG            (0 << 31)
+#define         ATMEL_LCDC_MEMOR_LITTLE         (1 << 31)
+#define ATMEL_LCDC_TIM1         0x0808
+#define ATMEL_LCDC_VFP          (0xff <<  0)
+#define ATMEL_LCDC_VBP_OFFSET           8
+#define ATMEL_LCDC_VBP          (0xff <<  ATMEL_LCDC_VBP_OFFSET)
+#define ATMEL_LCDC_VPW_OFFSET           16
+#define ATMEL_LCDC_VPW          (0x3f << ATMEL_LCDC_VPW_OFFSET)
+#define ATMEL_LCDC_VHDLY_OFFSET         24
+#define ATMEL_LCDC_VHDLY        (0xf  << ATMEL_LCDC_VHDLY_OFFSET)
+#define ATMEL_LCDC_TIM2         0x080c
+#define ATMEL_LCDC_HBP          (0xff  <<  0)
+#define ATMEL_LCDC_HPW_OFFSET           8
+#define ATMEL_LCDC_HPW          (0x3f  <<  ATMEL_LCDC_HPW_OFFSET)
+#define ATMEL_LCDC_HFP_OFFSET           21
+#define ATMEL_LCDC_HFP          (0x7ff << ATMEL_LCDC_HFP_OFFSET)
+#define ATMEL_LCDC_LCDFRMCFG    0x0810
+#define ATMEL_LCDC_LINEVAL      (0x7ff <<  0)
+#define ATMEL_LCDC_HOZVAL_OFFSET        21
+#define ATMEL_LCDC_HOZVAL       (0x7ff << ATMEL_LCDC_HOZVAL_OFFSET)
+#define ATMEL_LCDC_FIFO         0x0814
+#define ATMEL_LCDC_FIFOTH       (0xffff)
+#define ATMEL_LCDC_MVAL         0x0818
+#define ATMEL_LCDC_DP1_2        0x081c
+#define ATMEL_LCDC_DP4_7        0x0820
+#define ATMEL_LCDC_DP3_5        0x0824
+#define ATMEL_LCDC_DP2_3        0x0828
+#define ATMEL_LCDC_DP5_7        0x082c
+#define ATMEL_LCDC_DP3_4        0x0830
+#define ATMEL_LCDC_DP4_5        0x0834
+#define ATMEL_LCDC_DP6_7        0x0838
+#define ATMEL_LCDC_DP1_2_VAL    (0xff)
+#define ATMEL_LCDC_DP4_7_VAL    (0xfffffff)
+#define ATMEL_LCDC_DP3_5_VAL    (0xfffff)
+#define ATMEL_LCDC_DP2_3_VAL    (0xfff)
+#define ATMEL_LCDC_DP5_7_VAL    (0xfffffff)
+#define ATMEL_LCDC_DP3_4_VAL    (0xffff)
+#define ATMEL_LCDC_DP4_5_VAL    (0xfffff)
+#define ATMEL_LCDC_DP6_7_VAL    (0xfffffff)
+#define ATMEL_LCDC_PWRCON       0x083c
+#define ATMEL_LCDC_PWR          (1    <<  0)
+#define ATMEL_LCDC_GUARDT_OFFSET        1
+#define ATMEL_LCDC_GUARDT       (0x7f <<  ATMEL_LCDC_GUARDT_OFFSET)
+#define ATMEL_LCDC_BUSY         (1    << 31)
+#define ATMEL_LCDC_CONTRAST_CTR 0x0840
+#define ATMEL_LCDC_PS           (3 << 0)
+#define         ATMEL_LCDC_PS_DIV1              (0 << 0)
+#define         ATMEL_LCDC_PS_DIV2              (1 << 0)
+#define         ATMEL_LCDC_PS_DIV4              (2 << 0)
+#define         ATMEL_LCDC_PS_DIV8              (3 << 0)
+#define ATMEL_LCDC_POL          (1 << 2)
+#define         ATMEL_LCDC_POL_NEGATIVE         (0 << 2)
+#define         ATMEL_LCDC_POL_POSITIVE         (1 << 2)
+#define ATMEL_LCDC_ENA          (1 << 3)
+#define         ATMEL_LCDC_ENA_PWMDISABLE       (0 << 3)
+#define         ATMEL_LCDC_ENA_PWMENABLE        (1 << 3)
+#define ATMEL_LCDC_CONTRAST_VAL 0x0844
+#define ATMEL_LCDC_CVAL (0xff)
+#define ATMEL_LCDC_IER          0x0848
+#define ATMEL_LCDC_IDR          0x084c
+#define ATMEL_LCDC_IMR          0x0850
+#define ATMEL_LCDC_ISR          0x0854
+#define ATMEL_LCDC_ICR          0x0858
+#define ATMEL_LCDC_LNI          (1 << 0)
+#define ATMEL_LCDC_LSTLNI       (1 << 1)
+#define ATMEL_LCDC_EOFI         (1 << 2)
+#define ATMEL_LCDC_UFLWI        (1 << 4)
+#define ATMEL_LCDC_OWRI         (1 << 5)
+#define ATMEL_LCDC_MERI         (1 << 6)
+#define ATMEL_LCDC_LUT(n)       (0x0c00 + ((n)*4))
+#endif /* __ATMEL_LCDC_H__ */
diff --git a/include/video/pm3fb.h b/include/video/pm3fb.h
index 94c7d2da90ea..d52e45a1e9b8 100644
--- a/include/video/pm3fb.h
+++ b/include/video/pm3fb.h
@@ -7,9 +7,6 @@
 *  This file is subject to the terms and conditions of the GNU General Public
 *  License. See the file COPYING in the main directory of this archive for
 *  more details.
- *
- *  $Header: /cvsroot/linux/drivers/video/pm3fb.h,v 1.1 2002/02/25 19:11:06 marcelo Exp $
- *
 */
 #ifndef PM3FB_H
@@ -1119,117 +1116,10 @@
 /* ***** pm3fb useful define and macro ***** */
 /* ***************************************** */
-/* permedia3 -specific definitions */
-#define PM3_SCALE_TO_CLOCK(pr, fe, po) ((2 * PM3_REF_CLOCK * fe) / (pr * (1 << (po))))
-/* in case it's not in linux/pci.h */
-#ifndef PCI_DEVICE_ID_3DLABS_PERMEDIA3
-#define PCI_DEVICE_ID_3DLABS_PERMEDIA3 0x000a
-#endif
-/* max number of simultaneous board */
-#define PM3_MAX_BOARD 4
 /* max size of options */
 #define PM3_OPTIONS_SIZE 256
 /* max size of font name */
 #define PM3_FONTNAME_SIZE 40
-/* do we want accelerated console  */
-#define PM3FB_USE_ACCEL 1
-/* for driver debugging ONLY */
-/* 0 = assert only, 1 = error, 2 = info, 3+ = verbose */
-/* define PM3FB_MASTER_DEBUG 1 */
-#if defined(PM3FB_MASTER_DEBUG) && (PM3FB_MASTER_DEBUG >= 3)
-#define PM3FB_TRACE
-#endif /* defined(PM3FB_MASTER_DEBUG) && (PM3FB_MASTER_DEBUG >= 3) */
-#ifdef PM3FB_MASTER_DEBUG
-#define DPRINTK(l,a,b...) do { if ((l) <= PM3FB_MASTER_DEBUG) printk("pm3fb: %s: " a, __FUNCTION__ , ## b); } while (0)
-#define DASSERT(t,a,b...) do { if (!(t)) printk("pm3fb: _assert failed: %s: " a, __FUNCTION__ , ## b); } while (0)
-#ifdef PM3FB_TRACE
-#define DTRACE printk("pm3fb: _enter %s\n", __FUNCTION__)
-#else /* PM3FB_TRACE */
-#define DTRACE
-#endif /* PM3FB_TRACE */
-#else /* PM3FB_MASTER_DEBUG */
-#define DPRINTK(l,a,b...)
-#define DASSERT(t,a,b...)
-#define DTRACE
-#endif /* PM3FB_MASTER_DEBUG */
-#if defined(PM3FB_MASTER_DEBUG) && (PM3FB_MASTER_DEBUG >= 2)
-#define PM3_SHOW_CUR_MODE pm3fb_show_cur_mode(l_fb_info)
-#else
-#define PM3_SHOW_CUR_MODE /* pm3fb_show_cur_mode() */
-#endif
-/* ******************************************** */
-/* ***** A bunch of register-access macro ***** */
-/* ******************************************** */
-#define PM3_WRITE_REG(r, v) fb_writel(v, (l_fb_info->vIOBase + r))
-#define PM3_READ_REG(r) fb_readl((l_fb_info->vIOBase + r))
-#define depth2bpp(d) ((d + 7L) & ~7L)
-#define depth2ByPP(d) (depth2bpp(d) / 8)
-#define depth_supported(d) ((d == 8) || (d == 12) || (d == 15) || (d == 16) || (d==32))
-#define PM3_WAIT(n) \
-do{ \
-        while(PM3_READ_REG(PM3InFIFOSpace)<(n)); \
-} while(0)
-#define PM3_DELAY(x) do { \
-        int delay = x; \
-        unsigned char tmp; \
-        while(delay--){tmp = PM3_READ_REG(PM3InFIFOSpace);}; \
-} while(0)
-#define PM3_SLOW_WRITE_REG(r,v) \
-do{                             \
-    DASSERT((l_fb_info->vIOBase != (unsigned char*)(-1)), "l_fb_info->vIOBase mapped in slow write\n"); \
-        mb();                   \
-        PM3_WAIT(1);            \
-        mb();                   \
-    PM3_WRITE_REG(r,v);     \
-} while(0)
-#define PM3_SET_INDEX(index) \
-do{ \
-        PM3_SLOW_WRITE_REG(PM3RD_IndexHigh,(((index)>>8)&0xff)); \
-        PM3_SLOW_WRITE_REG(PM3RD_IndexLow,((index)&0xff)); \
-} while(0)
-#define PM3_WRITE_DAC_REG(r, v) \
-do { \
-     DASSERT((l_fb_info->vIOBase != (unsigned char*)(-1)), "l_fb_info->vIOBase mapped in write dac reg\n"); \
-     PM3_SET_INDEX(r); \
-     mb(); \
-     PM3_WRITE_REG(PM3RD_IndexedData, v); \
-} while (0)
-/* next one is really a function, added as a macro to be consistent */
-#define PM3_READ_DAC_REG(r) pm3fb_read_dac_reg(l_fb_info, r)
-#define PM3_COLOR(c) \
-do { \
-  if (l_fb_info->current_par->depth == 8) \
-    { \
-      c = (c & 0xFF); \
-      c = c | (c << 8); \
-    } \
-  if ((l_fb_info->current_par->depth == 8) || (depth2bpp(l_fb_info->current_par->depth) == 16)) \
-    { \
-      c = (c & 0xFFFF); \
-      c = c | (c << 16); \
-    } \
-} while (0)
 #endif /* PM3FB_H */