107 files changed, 1357 insertions, 1486 deletions
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c
index f3e98f837784..1898ea79d0e2 100644
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ b/arch/alpha/kernel/alpha_ksyms.c
@@ -40,7 +40,6 @@
 #include <asm/unistd.h>
 extern struct hwrpb_struct *hwrpb;
-extern void dump_thread(struct pt_regs *, struct user *);
 extern spinlock_t rtc_lock;
 /* these are C runtime functions with special calling conventions: */
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 90752f6d8867..486d7945583d 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -7,6 +7,7 @@
 /* 2.3.x zone allocator, 1999 Andrea Arcangeli <andrea@suse.de> */
 #include <linux/config.h>
+#include <linux/pagemap.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index f5cc21ad0956..a4e5ac77f6df 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -64,7 +64,7 @@ static int dma_chan_count;
 static spinlock_t dma_chan_lock;
 static struct omap_dma_lch dma_chan[OMAP_LOGICAL_DMA_CH_COUNT];
-const static u8 omap1_dma_irq[OMAP_LOGICAL_DMA_CH_COUNT] = {
+static const u8 omap1_dma_irq[OMAP_LOGICAL_DMA_CH_COUNT] = {
        INT_DMA_CH0_6, INT_DMA_CH1_7, INT_DMA_CH2_8, INT_DMA_CH3,
        INT_DMA_CH4, INT_DMA_CH5, INT_1610_DMA_CH6, INT_1610_DMA_CH7,
        INT_1610_DMA_CH8, INT_1610_DMA_CH9, INT_1610_DMA_CH10,
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c
index 35514b398e2e..811a6376c624 100644
--- a/arch/arm26/kernel/armksyms.c
+++ b/arch/arm26/kernel/armksyms.c
@@ -35,7 +35,6 @@
 #include <asm/checksum.h>
 #include <asm/mach-types.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(struct pt_regs *, struct user_fp_struct *);
 extern void inswb(unsigned int port, void *to, int len);
 extern void outswb(unsigned int port, const void *to, int len);
diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c
index 85833d704ebb..de39725da920 100644
--- a/arch/cris/kernel/crisksyms.c
+++ b/arch/cris/kernel/crisksyms.c
@@ -21,7 +21,6 @@
 #include <asm/pgtable.h>
 #include <asm/fasttimer.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 extern unsigned long get_cmos_time(void);
 extern void __Udiv(void);
 extern void __Umod(void);
@@ -33,7 +32,6 @@ extern void __lshrdi3(void);
 extern void iounmap(volatile void * __iomem);
 /* Platform dependent support */
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(get_cmos_time);
 EXPORT_SYMBOL(loops_per_usec);
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 7c80afb10460..4ab3e87115b6 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -257,34 +257,6 @@ void flush_thread(void)
 {
 }
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-#if 0
-        int i;
-        /* changed the size calculations - should hopefully work better. lbt */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = regs->esp & ~(PAGE_SIZE - 1);
-        dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
-        dump->u_dsize = ((unsigned long) (current->mm->brk + (PAGE_SIZE-1))) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-        for (i = 0; i < 8; i++)
-                dump->u_debugreg[i] = current->debugreg[i];  
-        if (dump->start_stack < TASK_SIZE)
-                dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
-        dump->regs = *regs;
-        dump->u_fpvalid = dump_fpu (regs, &dump->i387);
-#endif 
-}
 /* Fill in the fpu structure for a core dump. */
 int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
 {
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 61261b78ced7..60a617aff8ba 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,10 +6,6 @@ config FRV
        bool
        default y
-config UID16
-        bool
-        default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
diff --git a/arch/frv/boot/Makefile b/arch/frv/boot/Makefile
index d75e0d771366..5dfc93fd945a 100644
--- a/arch/frv/boot/Makefile
+++ b/arch/frv/boot/Makefile
@@ -57,10 +57,10 @@ initrd:
 # installation
 #
 install: $(CONFIGURE) Image
-        sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) Image $(TOPDIR)/System.map "$(INSTALL_PATH)"
+        sh ./install.sh $(KERNELRELEASE) Image $(TOPDIR)/System.map "$(INSTALL_PATH)"
 zinstall: $(CONFIGURE) zImage
-        sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
+        sh ./install.sh $(KERNELRELEASE) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
 #
 # miscellany
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c
index 5f118c89d091..0f1c6cbc4f50 100644
--- a/arch/frv/kernel/frv_ksyms.c
+++ b/arch/frv/kernel/frv_ksyms.c
@@ -18,7 +18,6 @@
 #include <asm/hardirq.h>
 #include <asm/cacheflush.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 extern long __memcpy_user(void *dst, const void *src, size_t count);
 extern long __memset_user(void *dst, const void *src, size_t count);
@@ -27,7 +26,6 @@ extern long __memset_user(void *dst, const void *src, size_t count);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 54a452136f00..c4488379ac3b 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -244,28 +244,6 @@ int copy_thread(int nr, unsigned long clone_flags,
 } /* end copy_thread() */
 /*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs *regs, struct user *dump)
-{
-#if 0
-        /* changed the size calculations - should hopefully work better. lbt */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = user_stack(regs) & ~(PAGE_SIZE - 1);
-        dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
-        dump->u_dsize = ((unsigned long) (current->mm->brk + (PAGE_SIZE-1))) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-        if (dump->start_stack < TASK_SIZE)
-                dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
-        dump->regs = *(struct user_context *) regs;
-#endif
-}
-/*
 * sys_execve() executes a new program.
 */
 asmlinkage int sys_execve(char *name, char **argv, char **envp)
diff --git a/arch/h8300/kernel/gpio.c b/arch/h8300/kernel/gpio.c
index 795682b873e2..d195568ca8a2 100644
--- a/arch/h8300/kernel/gpio.c
+++ b/arch/h8300/kernel/gpio.c
@@ -122,7 +122,7 @@ int h8300_get_gpio_dir(int port_bit)
 static char *port_status(int portno)
 {
        static char result[10];
-        const static char io[2]={'I','O'};
+        static const char io[2]={'I','O'};
        char *rp;
        int c;
        unsigned char used,ddr;
@@ -143,7 +143,7 @@ static int gpio_proc_read(char *buf, char **start, off_t offset,
                          int len, int *unused_i, void *unused_v)
 {
        int c,outlen;
-        const static char port_name[]="123456789ABCDEFGH";
+        static const char port_name[]="123456789ABCDEFGH";
        outlen = 0;
        for (c = 0; c < MAX_PORT; c++) {
                if (ddrs[c] == NULL)
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c
index 5a630233112f..3e0d80ea4464 100644
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
@@ -22,11 +22,8 @@
 //asmlinkage long long __lshrdi3 (long long, int);
 extern char h8300_debug_device[];
-extern void dump_thread(struct pt_regs *, struct user *);
 /* platform dependent support */
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index fe21adf3e75e..585ed5efd0f7 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -208,34 +208,6 @@ int copy_thread(int nr, unsigned long clone_flags,
 }
 /*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-/* changed the size calculations - should hopefully work better. lbt */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = rdusp() & ~(PAGE_SIZE - 1);
-        dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
-        dump->u_dsize = ((unsigned long) (current->mm->brk +
-                                          (PAGE_SIZE-1))) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-        dump->u_ar0 = (struct user_regs_struct *)(((int)(&dump->regs)) -((int)(dump)));
-        dump->regs.er0 = regs->er0;
-        dump->regs.er1 = regs->er1;
-        dump->regs.er2 = regs->er2;
-        dump->regs.er3 = regs->er3;
-        dump->regs.er4 = regs->er4;
-        dump->regs.er5 = regs->er5;
-        dump->regs.er6 = regs->er6;
-        dump->regs.orig_er0 = regs->orig_er0;
-        dump->regs.ccr = regs->ccr;
-        dump->regs.pc  = regs->pc;
-}
-/*
 * sys_execve() executes a new program.
 */
 asmlinkage int sys_execve(char *name, char **argv, char **envp,int dummy,...)
diff --git a/arch/h8300/platform/h8300h/ptrace_h8300h.c b/arch/h8300/platform/h8300h/ptrace_h8300h.c
index 6ac93c05a1ae..746b1ae672a1 100644
--- a/arch/h8300/platform/h8300h/ptrace_h8300h.c
+++ b/arch/h8300/platform/h8300h/ptrace_h8300h.c
@@ -98,7 +98,7 @@ struct optable {
                .type       = jmp, \
        }
-const static struct optable optable_0[] = {
+static const struct optable optable_0[] = {
        OPTABLE(0x00,0xff, 1,none), /* 0x00 */
        OPTABLE(0x01,0xff,-1,none), /* 0x01 */
        OPTABLE(0x02,0xfe, 1,none), /* 0x02-0x03 */
@@ -131,31 +131,31 @@ const static struct optable optable_0[] = {
        OPTABLE(0x80,0x80, 1,none), /* 0x80-0xff */
 };
-const static struct optable optable_1[] = {
+static const struct optable optable_1[] = {
        OPTABLE(0x00,0xff,-3,none), /* 0x0100 */
        OPTABLE(0x40,0xf0,-3,none), /* 0x0140-0x14f */
        OPTABLE(0x80,0xf0, 1,none), /* 0x0180-0x018f */
        OPTABLE(0xc0,0xc0, 2,none), /* 0x01c0-0x01ff */
 };
-const static struct optable optable_2[] = {
+static const struct optable optable_2[] = {
        OPTABLE(0x00,0x20, 2,none), /* 0x6a0?/0x6a8?/0x6b0?/0x6b8? */
        OPTABLE(0x20,0x20, 3,none), /* 0x6a2?/0x6aa?/0x6b2?/0x6ba? */
 };
-const static struct optable optable_3[] = {
+static const struct optable optable_3[] = {
        OPTABLE(0x69,0xfb, 2,none), /* 0x010069/0x01006d/014069/0x01406d */
        OPTABLE(0x6b,0xff,-4,none), /* 0x01006b/0x01406b */
        OPTABLE(0x6f,0xff, 3,none), /* 0x01006f/0x01406f */
        OPTABLE(0x78,0xff, 5,none), /* 0x010078/0x014078 */
 };
-const static struct optable optable_4[] = {
+static const struct optable optable_4[] = {
        OPTABLE(0x00,0x78, 3,none), /* 0x0100690?/0x01006d0?/0140690/0x01406d0?/0x0100698?/0x01006d8?/0140698?/0x01406d8? */
        OPTABLE(0x20,0x78, 4,none), /* 0x0100692?/0x01006d2?/0140692/0x01406d2?/0x010069a?/0x01006da?/014069a?/0x01406da? */
 };
-const static struct optables_list {
+static const struct optables_list {
        const struct optable *ptr;
        int size;
 } optables[] = {
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index 5441cdd12a39..f6ed663bdde0 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -52,7 +52,7 @@ struct irq_pins {
        unsigned char bit_no;
 };
 /* ISTR = 0 */
-const static struct irq_pins irq_assign_table0[16]={
+static const struct irq_pins irq_assign_table0[16]={
        {H8300_GPIO_P5,H8300_GPIO_B0},{H8300_GPIO_P5,H8300_GPIO_B1},
        {H8300_GPIO_P5,H8300_GPIO_B2},{H8300_GPIO_P5,H8300_GPIO_B3},
        {H8300_GPIO_P5,H8300_GPIO_B4},{H8300_GPIO_P5,H8300_GPIO_B5},
@@ -63,7 +63,7 @@ const static struct irq_pins irq_assign_table0[16]={
        {H8300_GPIO_PF,H8300_GPIO_B1},{H8300_GPIO_PF,H8300_GPIO_B2},
 };
 /* ISTR = 1 */
-const static struct irq_pins irq_assign_table1[16]={
+static const struct irq_pins irq_assign_table1[16]={
        {H8300_GPIO_P8,H8300_GPIO_B0},{H8300_GPIO_P8,H8300_GPIO_B1},
        {H8300_GPIO_P8,H8300_GPIO_B2},{H8300_GPIO_P8,H8300_GPIO_B3},
        {H8300_GPIO_P8,H8300_GPIO_B4},{H8300_GPIO_P8,H8300_GPIO_B5},
diff --git a/arch/h8300/platform/h8s/ints_h8s.c b/arch/h8300/platform/h8s/ints_h8s.c
index f53de493e3e8..8268dfd12f1f 100644
--- a/arch/h8300/platform/h8s/ints_h8s.c
+++ b/arch/h8300/platform/h8s/ints_h8s.c
@@ -42,7 +42,7 @@ struct irq_pins {
        unsigned char bit_no;
 } __attribute__((aligned(1),packed));
 /* ISTR = 0 */
-const static struct irq_pins irq_assign_table0[16]={
+static const struct irq_pins irq_assign_table0[16]={
        {H8300_GPIO_P5,H8300_GPIO_B0},{H8300_GPIO_P5,H8300_GPIO_B1},
        {H8300_GPIO_P5,H8300_GPIO_B2},{H8300_GPIO_P5,H8300_GPIO_B3},
        {H8300_GPIO_P5,H8300_GPIO_B4},{H8300_GPIO_P5,H8300_GPIO_B5},
@@ -53,7 +53,7 @@ const static struct irq_pins irq_assign_table0[16]={
        {H8300_GPIO_PF,H8300_GPIO_B1},{H8300_GPIO_PF,H8300_GPIO_B2},
 }; 
 /* ISTR = 1 */
-const static struct irq_pins irq_assign_table1[16]={
+static const struct irq_pins irq_assign_table1[16]={
        {H8300_GPIO_P8,H8300_GPIO_B0},{H8300_GPIO_P8,H8300_GPIO_B1},
        {H8300_GPIO_P8,H8300_GPIO_B2},{H8300_GPIO_P8,H8300_GPIO_B3},
        {H8300_GPIO_P8,H8300_GPIO_B4},{H8300_GPIO_P8,H8300_GPIO_B5},
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index d849c6870e3a..815878ebd30f 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -645,17 +645,6 @@ config SECCOMP
 source kernel/Kconfig.hz
-config PHYSICAL_START
-        hex "Physical address where the kernel is loaded" if EMBEDDED
-        default "0x100000"
-        help
-          This gives the physical address where the kernel is loaded.
-          Primarily used in the case of kexec on panic where the
-          fail safe kernel needs to run at a different address than
-          the panic-ed kernel.
-          Don't change this unless you know what you are doing.
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@ -675,11 +664,31 @@ config KEXEC
 config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
-        depends on EMBEDDED
        depends on EXPERIMENTAL
        depends on HIGHMEM
        help
          Generate crash dump after being started by kexec.
+config PHYSICAL_START
+        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+        default "0x1000000" if CRASH_DUMP
+        default "0x100000"
+        help
+          This gives the physical address where the kernel is loaded. Normally
+          for regular kernels this value is 0x100000 (1MB). But in the case
+          of kexec on panic the fail safe kernel needs to run at a different
+          address than the panic-ed kernel. This option is used to set the load
+          address for kernels used to capture crash dump on being kexec'ed
+          after panic. The default value for crash dump kernels is
+          0x1000000 (16MB). This can also be set based on the "X" value as
+          specified in the "crashkernel=YM@XM" command line boot parameter
+          passed to the panic-ed kernel. Typically this parameter is set as
+          crashkernel=64M@16M. Please take a look at
+          Documentation/kdump/kdump.txt for more details about crash dumps.
+          Don't change this unless you know what you are doing.
 endmenu
@@ -1051,3 +1060,7 @@ config X86_TRAMPOLINE
        bool
        depends on X86_SMP || (X86_VOYAGER && SMP)
        default y
+config KTIME_SCALAR
+        bool
+        default y
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index b84119f9cc63..d3c0409d201c 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -37,7 +37,10 @@ CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
 # CPU-specific tuning. Anything which can be shared with UML should go here.
 include $(srctree)/arch/i386/Makefile.cpu
-cflags-$(CONFIG_REGPARM)        += -mregparm=3
+# -mregparm=3 works ok on gcc-3.0 and later
+#
+cflags-$(CONFIG_REGPARM) += $(shell if [ $(call cc-version) -ge 0300 ] ; then \
+                            echo "-mregparm=3"; fi ;)
 # Disable unit-at-a-time mode, it makes gcc use a lot more stack
 # due to the lack of sharing of stacklots.
@@ -100,7 +103,7 @@ AFLAGS += $(mflags-y)
 boot := arch/i386/boot
 .PHONY: zImage bzImage compressed zlilo bzlilo \
-        zdisk bzdisk fdimage fdimage144 fdimage288 install kernel_install
+        zdisk bzdisk fdimage fdimage144 fdimage288 install
 all: bzImage
@@ -122,8 +125,7 @@ zdisk bzdisk: vmlinux
 fdimage fdimage144 fdimage288: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
-install: vmlinux
+install:
-install kernel_install:
        $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 archclean:
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index 1e71382d413a..0fea75dd4e31 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -100,5 +100,5 @@ zlilo: $(BOOTIMAGE)
        cp System.map $(INSTALL_PATH)/
        if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
-install: $(BOOTIMAGE)
+install:
        sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
diff --git a/arch/i386/boot/install.sh b/arch/i386/boot/install.sh
index f17b40dfc0f4..5e44c736eea8 100644
--- a/arch/i386/boot/install.sh
+++ b/arch/i386/boot/install.sh
@@ -19,6 +19,20 @@
 #   $4 - default install path (blank if root directory)
 #
+verify () {
+        if [ ! -f "$1" ]; then
+                echo ""                                                   1>&2
+                echo " *** Missing file: $1"                              1>&2
+                echo ' *** You need to run "make" before "make install".' 1>&2
+                echo ""                                                   1>&2
+                exit 1
+        fi
+}
+# Make sure the files actually exist
+verify "$2"
+verify "$3"
 # User may have a custom install script
 if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 92f669470142..2ac40c8244c4 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -97,7 +97,6 @@
 #define PARAM_VESAPM_OFF        0x30
 #define PARAM_LFB_PAGES         0x32
 #define PARAM_VESA_ATTRIB       0x34
-#define PARAM_CAPABILITIES      0x36
 /* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
 #ifdef CONFIG_VIDEO_RETAIN
@@ -234,10 +233,6 @@ mopar_gr:
        movw    18(%di), %ax
        movl    %eax, %fs:(PARAM_LFB_SIZE)
-# store mode capabilities
-        movl    10(%di), %eax
-        movl    %eax, %fs:(PARAM_CAPABILITIES)
 # switching the DAC to 8-bit is for <= 8 bpp only
        movw    %fs:(PARAM_LFB_DEPTH), %ax
        cmpw    $8, %ax
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index be1880bb75b4..60c3f76dfca4 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)       += io_apic.o
 obj-$(CONFIG_X86_REBOOTFIXUPS)  += reboot_fixups.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o crash.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_X86_NUMAQ)         += numaq.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)   += summit.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 0248e084017c..d49dbe8dc96b 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -25,7 +25,6 @@
 #include <mach_ipi.h>
-note_buf_t crash_notes[NR_CPUS];
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
@@ -72,7 +71,9 @@ static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
         * squirrelled away.  ELF notes happen to provide
         * all of that that no need to invent something new.
         */
-        buf = &crash_notes[cpu][0];
+        buf = (u32*)per_cpu_ptr(crash_notes, cpu);
+        if (!buf)
+                return;
        memset(&prstatus, 0, sizeof(prstatus));
        prstatus.pr_pid = current->pid;
        elf_core_copy_regs(&prstatus.pr_reg, regs);
@@ -81,51 +82,12 @@ static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
        final_note(buf);
 }
-static void crash_get_current_regs(struct pt_regs *regs)
+static void crash_save_self(struct pt_regs *regs)
-{
-        __asm__ __volatile__("movl %%ebx,%0" : "=m"(regs->ebx));
-        __asm__ __volatile__("movl %%ecx,%0" : "=m"(regs->ecx));
-        __asm__ __volatile__("movl %%edx,%0" : "=m"(regs->edx));
-        __asm__ __volatile__("movl %%esi,%0" : "=m"(regs->esi));
-        __asm__ __volatile__("movl %%edi,%0" : "=m"(regs->edi));
-        __asm__ __volatile__("movl %%ebp,%0" : "=m"(regs->ebp));
-        __asm__ __volatile__("movl %%eax,%0" : "=m"(regs->eax));
-        __asm__ __volatile__("movl %%esp,%0" : "=m"(regs->esp));
-        __asm__ __volatile__("movw %%ss, %%ax;" :"=a"(regs->xss));
-        __asm__ __volatile__("movw %%cs, %%ax;" :"=a"(regs->xcs));
-        __asm__ __volatile__("movw %%ds, %%ax;" :"=a"(regs->xds));
-        __asm__ __volatile__("movw %%es, %%ax;" :"=a"(regs->xes));
-        __asm__ __volatile__("pushfl; popl %0" :"=m"(regs->eflags));
-        regs->eip = (unsigned long)current_text_addr();
-}
-/* CPU does not save ss and esp on stack if execution is already
- * running in kernel mode at the time of NMI occurrence. This code
- * fixes it.
- */
-static void crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs)
-{
-        memcpy(newregs, oldregs, sizeof(*newregs));
-        newregs->esp = (unsigned long)&(oldregs->esp);
-        __asm__ __volatile__("xorl %eax, %eax;");
-        __asm__ __volatile__ ("movw %%ss, %%ax;" :"=a"(newregs->xss));
-}
-/* We may have saved_regs from where the error came from
- * or it is NULL if via a direct panic().
- */
-static void crash_save_self(struct pt_regs *saved_regs)
 {
-        struct pt_regs regs;
        int cpu;
        cpu = smp_processor_id();
-        if (saved_regs)
+        crash_save_this_cpu(regs, cpu);
-                crash_setup_regs(&regs, saved_regs);
-        else
-                crash_get_current_regs(&regs);
-        crash_save_this_cpu(&regs, cpu);
 }
 #ifdef CONFIG_SMP
@@ -144,7 +106,7 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
        local_irq_disable();
        if (!user_mode(regs)) {
-                crash_setup_regs(&fixed_regs, regs);
+                crash_fixup_ss_esp(&fixed_regs, regs);
                regs = &fixed_regs;
        }
        crash_save_this_cpu(regs, cpu);
diff --git a/arch/i386/kernel/crash_dump.c b/arch/i386/kernel/crash_dump.c
new file mode 100644
index 000000000000..3f532df488bc
--- /dev/null
+++ b/arch/i386/kernel/crash_dump.c
@@ -0,0 +1,74 @@
+/*
+ *      kernel/crash_dump.c - Memory preserving reboot related code.
+ *
+ *      Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
+ *      Copyright (C) IBM Corporation, 2004. All rights reserved
+ */
+#include <linux/errno.h>
+#include <linux/highmem.h>
+#include <linux/crash_dump.h>
+#include <asm/uaccess.h>
+static void *kdump_buf_page;
+/**
+ * copy_oldmem_page - copy one page from "oldmem"
+ * @pfn: page frame number to be copied
+ * @buf: target memory address for the copy; this can be in kernel address
+ *      space or user address space (see @userbuf)
+ * @csize: number of bytes to copy
+ * @offset: offset in bytes into the page (based on pfn) to begin the copy
+ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
+ *      otherwise @buf is in kernel address space, use memcpy().
+ *
+ * Copy a page from "oldmem". For this page, there is no pte mapped
+ * in the current kernel. We stitch up a pte, similar to kmap_atomic.
+ *
+ * Calling copy_to_user() in atomic context is not desirable. Hence first
+ * copying the data to a pre-allocated kernel page and then copying to user
+ * space in non-atomic context.
+ */
+ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
+                               size_t csize, unsigned long offset, int userbuf)
+{
+        void  *vaddr;
+        if (!csize)
+                return 0;
+        vaddr = kmap_atomic_pfn(pfn, KM_PTE0);
+        if (!userbuf) {
+                memcpy(buf, (vaddr + offset), csize);
+                kunmap_atomic(vaddr, KM_PTE0);
+        } else {
+                if (!kdump_buf_page) {
+                        printk(KERN_WARNING "Kdump: Kdump buffer page not"
+                                " allocated\n");
+                        return -EFAULT;
+                }
+                copy_page(kdump_buf_page, vaddr);
+                kunmap_atomic(vaddr, KM_PTE0);
+                if (copy_to_user(buf, (kdump_buf_page + offset), csize))
+                        return -EFAULT;
+        }
+        return csize;
+}
+static int __init kdump_buf_page_init(void)
+{
+        int ret = 0;
+        kdump_buf_page = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (!kdump_buf_page) {
+                printk(KERN_WARNING "Kdump: Failed to allocate kdump buffer"
+                         " page\n");
+                ret = -ENOMEM;
+        }
+        return ret;
+}
+arch_initcall(kdump_buf_page_init);
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index 19edcd526ba4..2f372dbd34fd 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -58,13 +58,9 @@ static inline int is_IF_modifier(kprobe_opcode_t opcode)
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
-        return 0;
-}
-void __kprobes arch_copy_kprobe(struct kprobe *p)
-{
        memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
        p->opcode = *p->addr;
+        return 0;
 }
 void __kprobes arch_arm_kprobe(struct kprobe *p)
@@ -81,10 +77,6 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
                           (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
-void __kprobes arch_remove_kprobe(struct kprobe *p)
-{
-}
 static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
        kcb->prev_kprobe.kp = kprobe_running();
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 27c956db0461..f685637a100d 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -898,7 +898,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                        }
                }
 #endif
-#ifdef CONFIG_CRASH_DUMP
+#ifdef CONFIG_PROC_VMCORE
                /* elfcorehdr= specifies the location of elf core header
                 * stored by the crashed kernel.
                 */
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 53ad954e3ba4..b9f0030a2ebb 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -120,7 +120,7 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo,
 #ifdef  CONFIG_FRAME_POINTER
        while (valid_stack_ptr(tinfo, (void *)ebp)) {
                addr = *(unsigned long *)(ebp + 4);
-                printk(" [<%08lx>] ", addr);
+                printk(KERN_EMERG " [<%08lx>] ", addr);
                print_symbol("%s", addr);
                printk("\n");
                ebp = *(unsigned long *)ebp;
@@ -129,7 +129,7 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo,
        while (valid_stack_ptr(tinfo, stack)) {
                addr = *stack++;
                if (__kernel_text_address(addr)) {
-                        printk(" [<%08lx>]", addr);
+                        printk(KERN_EMERG " [<%08lx>]", addr);
                        print_symbol(" %s", addr);
                        printk("\n");
                }
@@ -161,7 +161,7 @@ void show_trace(struct task_struct *task, unsigned long * stack)
                stack = (unsigned long*)context->previous_esp;
                if (!stack)
                        break;
-                printk(" =======================\n");
+                printk(KERN_EMERG " =======================\n");
        }
 }
@@ -178,14 +178,15 @@ void show_stack(struct task_struct *task, unsigned long *esp)
        }
        stack = esp;
+        printk(KERN_EMERG);
        for(i = 0; i < kstack_depth_to_print; i++) {
                if (kstack_end(stack))
                        break;
                if (i && ((i % 8) == 0))
-                        printk("\n       ");
+                        printk("\n" KERN_EMERG "       ");
                printk("%08lx ", *stack++);
        }
-        printk("\nCall Trace:\n");
+        printk("\n" KERN_EMERG "Call Trace:\n");
        show_trace(task, esp);
 }
@@ -216,18 +217,18 @@ void show_registers(struct pt_regs *regs)
                ss = regs->xss & 0xffff;
        }
        print_modules();
-        printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\nEFLAGS: %08lx"
+        printk(KERN_EMERG "CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\n"
-                        "   (%s) \n",
+                        "EFLAGS: %08lx   (%s) \n",
                smp_processor_id(), 0xffff & regs->xcs, regs->eip,
                print_tainted(), regs->eflags, system_utsname.release);
-        print_symbol("EIP is at %s\n", regs->eip);
+        print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip);
-        printk("eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
+        printk(KERN_EMERG "eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
                regs->eax, regs->ebx, regs->ecx, regs->edx);
-        printk("esi: %08lx   edi: %08lx   ebp: %08lx   esp: %08lx\n",
+        printk(KERN_EMERG "esi: %08lx   edi: %08lx   ebp: %08lx   esp: %08lx\n",
                regs->esi, regs->edi, regs->ebp, esp);
-        printk("ds: %04x   es: %04x   ss: %04x\n",
+        printk(KERN_EMERG "ds: %04x   es: %04x   ss: %04x\n",
                regs->xds & 0xffff, regs->xes & 0xffff, ss);
-        printk("Process %s (pid: %d, threadinfo=%p task=%p)",
+        printk(KERN_EMERG "Process %s (pid: %d, threadinfo=%p task=%p)",
                current->comm, current->pid, current_thread_info(), current);
        /*
         * When in-kernel, we also print out the stack and code at the
@@ -236,10 +237,10 @@ void show_registers(struct pt_regs *regs)
        if (in_kernel) {
                u8 __user *eip;
-                printk("\nStack: ");
+                printk("\n" KERN_EMERG "Stack: ");
                show_stack(NULL, (unsigned long*)esp);
-                printk("Code: ");
+                printk(KERN_EMERG "Code: ");
                eip = (u8 __user *)regs->eip - 43;
                for (i = 0; i < 64; i++, eip++) {
@@ -280,15 +281,15 @@ static void handle_BUG(struct pt_regs *regs)
                (unsigned long)file < PAGE_OFFSET || __get_user(c, file))
                file = "<bad filename>";
-        printk("------------[ cut here ]------------\n");
+        printk(KERN_EMERG "------------[ cut here ]------------\n");
-        printk(KERN_ALERT "kernel BUG at %s:%d!\n", file, line);
+        printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
 no_bug:
        return;
        /* Here we know it was a BUG but file-n-line is unavailable */
 bug:
-        printk("Kernel BUG\n");
+        printk(KERN_EMERG "Kernel BUG\n");
 }
 /* This is gone through when something in the kernel
@@ -321,16 +322,20 @@ void die(const char * str, struct pt_regs * regs, long err)
        if (++die.lock_owner_depth < 3) {
                int nl = 0;
                handle_BUG(regs);
-                printk(KERN_ALERT "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+                printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
-                printk("PREEMPT ");
+                printk(KERN_EMERG "PREEMPT ");
                nl = 1;
 #endif
 #ifdef CONFIG_SMP
+                if (!nl)
+                        printk(KERN_EMERG);
                printk("SMP ");
                nl = 1;
 #endif
 #ifdef CONFIG_DEBUG_PAGEALLOC
+                if (!nl)
+                        printk(KERN_EMERG);
                printk("DEBUG_PAGEALLOC");
                nl = 1;
 #endif
@@ -339,7 +344,7 @@ void die(const char * str, struct pt_regs * regs, long err)
        notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
                show_registers(regs);
        } else
-                printk(KERN_ERR "Recursive die() failure, output suppressed\n");
+                printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
        bust_spinlocks(0);
        die.lock_owner = -1;
@@ -527,8 +532,10 @@ gp_in_kernel:
 static void mem_parity_error(unsigned char reason, struct pt_regs * regs)
 {
-        printk("Uhhuh. NMI received. Dazed and confused, but trying to continue\n");
+        printk(KERN_EMERG "Uhhuh. NMI received. Dazed and confused, but trying "
-        printk("You probably have a hardware problem with your RAM chips\n");
+                        "to continue\n");
+        printk(KERN_EMERG "You probably have a hardware problem with your RAM "
+                        "chips\n");
        /* Clear and disable the memory parity error line. */
        clear_mem_error(reason);
@@ -538,7 +545,7 @@ static void io_check_error(unsigned char reason, struct pt_regs * regs)
 {
        unsigned long i;
-        printk("NMI: IOCK error (debug interrupt?)\n");
+        printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n");
        show_registers(regs);
        /* Re-enable the IOCK line, wait for a few seconds */
@@ -580,11 +587,11 @@ void die_nmi (struct pt_regs *regs, const char *msg)
        * to get a message out.
        */
        bust_spinlocks(1);
-        printk(msg);
+        printk(KERN_EMERG "%s", msg);
        printk(" on CPU%d, eip %08lx, registers:\n",
                smp_processor_id(), regs->eip);
        show_registers(regs);
-        printk("console shuts up ...\n");
+        printk(KERN_EMERG "console shuts up ...\n");
        console_silent();
        spin_unlock(&nmi_print_lock);
        bust_spinlocks(0);
@@ -990,8 +997,8 @@ asmlinkage void math_state_restore(struct pt_regs regs)
 asmlinkage void math_emulate(long arg)
 {
-        printk("math-emulation not enabled and no coprocessor found.\n");
+        printk(KERN_EMERG "math-emulation not enabled and no coprocessor found.\n");
-        printk("killing %s.\n",current->comm);
+        printk(KERN_EMERG "killing %s.\n",current->comm);
        force_sig(SIGFPE,current);
        schedule();
 }
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 57b047c27e46..f722e1a25948 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -25,7 +25,6 @@ cflags-y	:= -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
                   -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
 CFLAGS_KERNEL   := -mconstant-gp
-GCC_VERSION     := $(call cc-version)
 GAS_STATUS      = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
 CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
@@ -37,7 +36,7 @@ $(error Sorry, you need a newer version of the assember, one that is built from
                ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
 endif
-ifeq ($(GCC_VERSION),0304)
+ifeq ($(call cc-version),0304)
        cflags-$(CONFIG_ITANIUM)        += -mtune=merced
        cflags-$(CONFIG_MCKINLEY)       += -mtune=mckinley
 endif
diff --git a/arch/ia64/ia32/Makefile b/arch/ia64/ia32/Makefile
index 2ed90da81166..61cb60affd95 100644
--- a/arch/ia64/ia32/Makefile
+++ b/arch/ia64/ia32/Makefile
@@ -2,11 +2,9 @@
 # Makefile for the ia32 kernel emulation subsystem.
 #
-obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o \
+obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \
         ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o
-CFLAGS_ia32_ioctl.o += -Ifs/
 # Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and
 # restore_ia32_fpstate_live() can be sure the live register contain user-level state.
 CFLAGS_ia32_signal.o += -mfixed-range=f16-f31
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 494fad6bf376..95fe04400f6b 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -469,7 +469,7 @@ ia32_syscall_table:
        data8 sys32_epoll_wait
        data8 sys_remap_file_pages
        data8 sys_set_tid_address
-        data8 sys32_timer_create
+        data8 compat_sys_timer_create
        data8 compat_sys_timer_settime  /* 260 */
        data8 compat_sys_timer_gettime
        data8 sys_timer_getoverrun
diff --git a/arch/ia64/ia32/ia32_ioctl.c b/arch/ia64/ia32/ia32_ioctl.c
deleted file mode 100644
index 88739394f6df..000000000000
--- a/arch/ia64/ia32/ia32_ioctl.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * IA32 Architecture-specific ioctl shim code
- *
- * Copyright (C) 2000 VA Linux Co
- * Copyright (C) 2000 Don Dugger <n0ano@valinux.com>
- * Copyright (C) 2001-2003 Hewlett-Packard Co
- *      David Mosberger-Tang <davidm@hpl.hp.com>
- */
-#include <linux/signal.h>       /* argh, msdos_fs.h isn't self-contained... */
-#include <linux/syscalls.h>
-#include "ia32priv.h"
-  
-#define INCLUDES
-#include "compat_ioctl.c"
-#define IOCTL_NR(a)     ((a) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT))
-#define DO_IOCTL(fd, cmd, arg) ({                       \
-        int _ret;                                       \
-        mm_segment_t _old_fs = get_fs();                \
-                                                        \
-        set_fs(KERNEL_DS);                              \
-        _ret = sys_ioctl(fd, cmd, (unsigned long)arg);  \
-        set_fs(_old_fs);                                \
-        _ret;                                           \
-})
-#define CODE
-#include "compat_ioctl.c"
-#define COMPATIBLE_IOCTL(cmd)           HANDLE_IOCTL((cmd),sys_ioctl)
-#define HANDLE_IOCTL(cmd,handler)       { (cmd), (ioctl_trans_handler_t)(handler), NULL },
-#define IOCTL_TABLE_START \
-        struct ioctl_trans ioctl_start[] = {
-#define IOCTL_TABLE_END \
-        };
-IOCTL_TABLE_START
-#define DECLARES
-#include "compat_ioctl.c"
-#include <linux/compat_ioctl.h>
-IOCTL_TABLE_END
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 9f8e8d558873..5ea38286d8d5 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -2553,34 +2553,6 @@ sys32_get_thread_area (struct ia32_user_desc __user *u_info)
        return 0;
 }
-asmlinkage long
-sys32_timer_create(u32 clock, struct compat_sigevent __user *se32, timer_t __user *timer_id)
-{
-        struct sigevent se;
-        mm_segment_t oldfs;
-        timer_t t;
-        long err;
-        if (se32 == NULL)
-                return sys_timer_create(clock, NULL, timer_id);
-        if (get_compat_sigevent(&se, se32))
-                return -EFAULT;
-        if (!access_ok(VERIFY_WRITE,timer_id,sizeof(timer_t)))
-                return -EFAULT;
-        oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        err = sys_timer_create(clock, (struct sigevent __user *) &se, (timer_t __user *) &t);
-        set_fs(oldfs);
-        if (!err)
-                err = __put_user (t, timer_id);
-        return err;
-}
 long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high, 
                        __u32 len_low, __u32 len_high, int advice)
 { 
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 89a70400c4f6..4de7f6759093 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -467,10 +467,6 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
        flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
 }
-void __kprobes arch_remove_kprobe(struct kprobe *p)
-{
-}
 /*
 * We are resuming execution after a single step fault, so the pt_regs
 * structure reflects the register state after we executed the instruction
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index fae67bbb52f6..a3dcc3fab4b7 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -12,10 +12,6 @@ config M32R
 config SBUS
        bool
-config UID16
-        bool
-        default n
 config GENERIC_ISA_DMA
        bool
        default y
diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c
index e5ec134d81d9..dbc8a392105f 100644
--- a/arch/m32r/kernel/m32r_ksyms.c
+++ b/arch/m32r/kernel/m32r_ksyms.c
@@ -18,8 +18,6 @@
 #include <asm/irq.h>
 #include <asm/tlbflush.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) || defined(CONFIG_BLK_DEV_IDE_MODULE) || defined(CONFIG_BLK_DEV_HD_MODULE)
 extern struct drive_info_struct drive_info;
 EXPORT_SYMBOL(drive_info);
@@ -27,7 +25,6 @@ EXPORT_SYMBOL(drive_info);
 /* platform dependent support */
 EXPORT_SYMBOL(boot_cpu_data);
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 3bf55d92933f..2a1f250349b7 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -261,14 +261,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long spu,
 }
 /*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        /* M32R_FIXME */
-}
-/*
 * Capture the user space registers if the task is not running (in user space)
 */
 int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c
index 73e2f5e168dd..3d7f2000b714 100644
--- a/arch/m68k/kernel/m68k_ksyms.c
+++ b/arch/m68k/kernel/m68k_ksyms.c
@@ -23,8 +23,6 @@ asmlinkage long long __lshrdi3 (long long, int);
 asmlinkage long long __muldi3 (long long, long long);
 extern char m68k_debug_device[];
-extern void dump_thread(struct pt_regs *, struct user *);
 /* platform dependent support */
 EXPORT_SYMBOL(m68k_machtype);
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c
index b2c62eeb3bab..eddb8d3e130a 100644
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
@@ -18,7 +18,6 @@
 #include <asm/checksum.h>
 #include <asm/current.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 /* platform dependent support */
@@ -26,7 +25,6 @@ extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 82e7ec888806..8b3cf57ba706 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -276,52 +276,6 @@ int dump_fpu(struct pt_regs *regs, struct user_m68kfp_struct *fpu)
 }
 /*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        struct switch_stack *sw;
-        /* changed the size calculations - should hopefully work better. lbt */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = rdusp() & ~(PAGE_SIZE - 1);
-        dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
-        dump->u_dsize = ((unsigned long) (current->mm->brk +
-                                          (PAGE_SIZE-1))) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-        if (dump->start_stack < TASK_SIZE)
-                dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
-        dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
-        sw = ((struct switch_stack *)regs) - 1;
-        dump->regs.d1 = regs->d1;
-        dump->regs.d2 = regs->d2;
-        dump->regs.d3 = regs->d3;
-        dump->regs.d4 = regs->d4;
-        dump->regs.d5 = regs->d5;
-        dump->regs.d6 = sw->d6;
-        dump->regs.d7 = sw->d7;
-        dump->regs.a0 = regs->a0;
-        dump->regs.a1 = regs->a1;
-        dump->regs.a2 = regs->a2;
-        dump->regs.a3 = sw->a3;
-        dump->regs.a4 = sw->a4;
-        dump->regs.a5 = sw->a5;
-        dump->regs.a6 = sw->a6;
-        dump->regs.d0 = regs->d0;
-        dump->regs.orig_d0 = regs->orig_d0;
-        dump->regs.stkadj = regs->stkadj;
-        dump->regs.sr = regs->sr;
-        dump->regs.pc = regs->pc;
-        dump->regs.fmtvec = (regs->format << 12) | regs->vector;
-        /* dump floating point stuff */
-        dump->u_fpvalid = dump_fpu (regs, &dump->m68kfp);
-}
-/*
 *      Generic dumping code. Used for panic and debug.
 */
 void dump(struct pt_regs *fp)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 72f2126ad19d..f36c4f20ee8a 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -50,7 +50,7 @@ obj-$(CONFIG_MIPS_BOARDS_GEN)	+= irq-msc01.o
 obj-$(CONFIG_32BIT)             += scall32-o32.o
 obj-$(CONFIG_64BIT)             += scall64-64.o
 obj-$(CONFIG_BINFMT_IRIX)       += binfmt_irix.o
-obj-$(CONFIG_MIPS32_COMPAT)     += ioctl32.o linux32.o signal32.o
+obj-$(CONFIG_MIPS32_COMPAT)     += linux32.o signal32.o
 obj-$(CONFIG_MIPS32_N32)        += binfmt_elfn32.o scall64-n32.o signal_n32.o
 obj-$(CONFIG_MIPS32_O32)        += binfmt_elfo32.o scall64-o32.o ptrace32.o
@@ -60,6 +60,5 @@ obj-$(CONFIG_PROC_FS)		+= proc.o
 obj-$(CONFIG_64BIT)             += cpu-bugs64.o
 CFLAGS_cpu-bugs64.o     = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
-CFLAGS_ioctl32.o        += -Ifs/
 EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/kernel/ioctl32.c b/arch/mips/kernel/ioctl32.c
deleted file mode 100644
index 9ea1fc748864..000000000000
--- a/arch/mips/kernel/ioctl32.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
- *
- * Copyright (C) 2000 Silicon Graphics, Inc.
- * Written by Ulf Carlsson (ulfc@engr.sgi.com)
- * Copyright (C) 2000, 2004 Ralf Baechle
- * Copyright (C) 2002, 2003  Maciej W. Rozycki
- */
-#define INCLUDES
-#include "compat_ioctl.c"
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/compat.h>
-#include <linux/ioctl32.h>
-#include <linux/syscalls.h>
-#ifdef CONFIG_SIBYTE_TBPROF
-#include <asm/sibyte/trace_prof.h>
-#endif
-#define A(__x) ((unsigned long)(__x))
-long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
-#define CODE
-#include "compat_ioctl.c"
-#define COMPATIBLE_IOCTL(cmd)           HANDLE_IOCTL((cmd),sys_ioctl)
-#define HANDLE_IOCTL(cmd,handler)       { (cmd), (ioctl_trans_handler_t)(handler), NULL },
-#define IOCTL_TABLE_START \
-        struct ioctl_trans ioctl_start[] = {
-#define IOCTL_TABLE_END \
-        };
-IOCTL_TABLE_START
-#include <linux/compat_ioctl.h>
-#define DECLARES
-#include "compat_ioctl.c"
-/*HANDLE_IOCTL(RTC_IRQP_READ, w_long)
-COMPATIBLE_IOCTL(RTC_IRQP_SET)
-HANDLE_IOCTL(RTC_EPOCH_READ, w_long)
-COMPATIBLE_IOCTL(RTC_EPOCH_SET)
-*/
-IOCTL_TABLE_END
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 171f9c239f60..27827bc3717e 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -6,7 +6,6 @@ extra-y			:= init_task.o head.o vmlinux.lds
 AFLAGS_entry.o  := -traditional
 AFLAGS_pacache.o := -traditional
-CFLAGS_ioctl32.o := -Ifs/
 obj-y           := cache.o pacache.o setup.o traps.o time.o irq.o \
                   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
@@ -19,6 +18,6 @@ obj-$(CONFIG_SMP)	+= smp.o
 obj-$(CONFIG_PA11)      += pci-dma.o
 obj-$(CONFIG_PCI)       += pci.o
 obj-$(CONFIG_MODULES)   += module.o
-obj-$(CONFIG_64BIT)     += binfmt_elf32.o sys_parisc32.o ioctl32.o signal32.o
+obj-$(CONFIG_64BIT)     += binfmt_elf32.o sys_parisc32.o signal32.o
 # only supported for PCX-W/U in 64-bit mode at the moment
 obj-$(CONFIG_64BIT)     += perf.o perf_asm.o
diff --git a/arch/parisc/kernel/ioctl32.c b/arch/parisc/kernel/ioctl32.c
deleted file mode 100644
index 4eada1bb27f0..000000000000
--- a/arch/parisc/kernel/ioctl32.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $Id: ioctl32.c,v 1.5 2002/10/18 00:21:43 varenet Exp $
- * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
- *
- * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
- * Copyright (C) 1998  Eddie C. Dost  (ecd@skynet.be)
- *
- * These routines maintain argument size conversion between 32bit and 64bit
- * ioctls.
- */
-#include <linux/syscalls.h>
-#define INCLUDES
-#include "compat_ioctl.c"
-#include <asm/perf.h>
-#include <asm/ioctls.h>
-#define CODE
-#include "compat_ioctl.c"
-#define HANDLE_IOCTL(cmd, handler) { cmd, (ioctl_trans_handler_t)handler, NULL },
-#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd, sys_ioctl) 
-#define IOCTL_TABLE_START  struct ioctl_trans ioctl_start[] = {
-#define IOCTL_TABLE_END    };
-IOCTL_TABLE_START
-#include <linux/compat_ioctl.h>
-#define DECLARES
-#include "compat_ioctl.c"
-/* And these ioctls need translation */
-HANDLE_IOCTL(SIOCGPPPSTATS, dev_ifsioc)
-HANDLE_IOCTL(SIOCGPPPCSTATS, dev_ifsioc)
-HANDLE_IOCTL(SIOCGPPPVER, dev_ifsioc)
-#if defined(CONFIG_GEN_RTC)
-COMPATIBLE_IOCTL(RTC_AIE_ON)
-COMPATIBLE_IOCTL(RTC_AIE_OFF)
-COMPATIBLE_IOCTL(RTC_UIE_ON)
-COMPATIBLE_IOCTL(RTC_UIE_OFF)
-COMPATIBLE_IOCTL(RTC_PIE_ON)
-COMPATIBLE_IOCTL(RTC_PIE_OFF)
-COMPATIBLE_IOCTL(RTC_WIE_ON)
-COMPATIBLE_IOCTL(RTC_WIE_OFF)
-COMPATIBLE_IOCTL(RTC_ALM_SET)   /* struct rtc_time only has ints */
-COMPATIBLE_IOCTL(RTC_ALM_READ)  /* struct rtc_time only has ints */
-COMPATIBLE_IOCTL(RTC_RD_TIME)   /* struct rtc_time only has ints */
-COMPATIBLE_IOCTL(RTC_SET_TIME)  /* struct rtc_time only has ints */
-HANDLE_IOCTL(RTC_IRQP_READ, w_long)
-COMPATIBLE_IOCTL(RTC_IRQP_SET)
-HANDLE_IOCTL(RTC_EPOCH_READ, w_long)
-COMPATIBLE_IOCTL(RTC_EPOCH_SET)
-#endif
-IOCTL_TABLE_END
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 28004f002ec9..935d96571515 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -275,6 +275,7 @@ config PPC_PSERIES
        select PPC_I8259
        select PPC_RTAS
        select RTAS_ERROR_LOGGING
+        select PPC_UDBG_16550
        default y
 config PPC_CHRP
@@ -284,6 +285,7 @@ config PPC_CHRP
        select PPC_INDIRECT_PCI
        select PPC_RTAS
        select PPC_MPC106
+        select PPC_UDBG_16550
        default y
 config PPC_PMAC
@@ -306,6 +308,7 @@ config PPC_PREP
        depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
        select PPC_I8259
        select PPC_INDIRECT_PCI
+        select PPC_UDBG_16550
        default y
 config PPC_MAPLE
@@ -314,6 +317,7 @@ config PPC_MAPLE
        select U3_DART
        select MPIC_BROKEN_U3
        select GENERIC_TBSYNC
+        select PPC_UDBG_16550
        default n
        help
          This option enables support for the Maple 970FX Evaluation Board.
@@ -324,6 +328,7 @@ config PPC_CELL
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_RTAS
        select MMIO_NVRAM
+        select PPC_UDBG_16550
 config PPC_OF
        def_bool y
@@ -370,6 +375,10 @@ config MPIC_BROKEN_U3
        depends on PPC_MAPLE
        default y
+config PPC_UDBG_16550
+        bool
+        default n
 config CELL_IIC
        depends on PPC_CELL
        bool
@@ -403,7 +412,7 @@ config PPC_MPC106
 config GENERIC_TBSYNC
        bool
-        default y if CONFIG_PPC32 && CONFIG_SMP
+        default y if PPC32 && SMP
        default n
 source "drivers/cpufreq/Kconfig"
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 5f80e58e5cb3..d3654a264ef7 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -76,8 +76,7 @@ LINUXINCLUDE    += $(LINUXINCLUDE-y)
 CHECKFLAGS      += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
 ifeq ($(CONFIG_PPC64),y)
-GCC_VERSION     := $(call cc-version)
+GCC_BROKEN_VEC  := $(shell if [ $(call cc-version) -lt 0400 ] ; then echo "y"; fi)
-GCC_BROKEN_VEC  := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi)
 ifeq ($(CONFIG_POWER4_ONLY),y)
 ifeq ($(CONFIG_ALTIVEC),y)
@@ -189,10 +188,9 @@ TOUT	:= .tmp_gas_check
 # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec
 # instructions.
 # gcc-3.4 and binutils-2.14 are a fatal combination.
-GCC_VERSION     := $(call cc-version)
 checkbin:
-        @if test "$(GCC_VERSION)" = "0304" ; then \
+        @if test "$(call cc-version)" = "0304" ; then \
                if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \
                        echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \
                        echo 'correctly with gcc-3.4 and your version of binutils.'; \
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 509399eab6f5..347f4391db8d 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -861,7 +861,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_PMACZILOG is not set
 CONFIG_SERIAL_ICOM=m
-CONFIG_SERIAL_JSM=m
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 6e03b595b6c8..144e284d21dd 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -4,7 +4,6 @@
 ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS    += -mno-minimal-toc
-CFLAGS_ioctl32.o += -Ifs/
 endif
 ifeq ($(CONFIG_PPC32),y)
 CFLAGS_prom_init.o      += -fPIC
@@ -16,7 +15,7 @@ obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \
 obj-y                           += vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                   signal_64.o ptrace32.o systbl.o \
-                                   paca.o ioctl32.o cpu_setup_power4.o \
+                                   paca.o cpu_setup_power4.o \
                                   firmware.o sysfs.o idle_64.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
@@ -55,7 +54,7 @@ obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
 obj-$(CONFIG_6xx)               += idle_6xx.o
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
-obj-$(CONFIG_SERIAL_8250)       += legacy_serial.o udbg_16550.o
+obj-$(CONFIG_PPC_UDBG_16550)    += legacy_serial.o udbg_16550.o
 module-$(CONFIG_PPC64)          += module_64.o
 obj-$(CONFIG_MODULES)           += $(module-y)
diff --git a/arch/powerpc/kernel/ioctl32.c b/arch/powerpc/kernel/ioctl32.c
deleted file mode 100644
index 0fa3d27fef01..000000000000
--- a/arch/powerpc/kernel/ioctl32.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
- *
- * Based on sparc64 ioctl32.c by:
- *
- * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
- * Copyright (C) 1998  Eddie C. Dost  (ecd@skynet.be)
- *
- * ppc64 changes:
- *
- * Copyright (C) 2000  Ken Aaker (kdaaker@rchland.vnet.ibm.com)
- * Copyright (C) 2001  Anton Blanchard (antonb@au.ibm.com)
- *
- * These routines maintain argument size conversion between 32bit and 64bit
- * ioctls.
- *
- * 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.
- */
-#define INCLUDES
-#include "compat_ioctl.c"
-#include <linux/syscalls.h>
-#define CODE
-#include "compat_ioctl.c"
-#define HANDLE_IOCTL(cmd,handler) { cmd, (ioctl_trans_handler_t)handler, NULL },
-#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd,sys_ioctl)
-#define IOCTL_TABLE_START \
-        struct ioctl_trans ioctl_start[] = {
-#define IOCTL_TABLE_END \
-        };
-IOCTL_TABLE_START
-#include <linux/compat_ioctl.h>
-#define DECLARES
-#include "compat_ioctl.c"
-IOCTL_TABLE_END
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 5368f9c2e6bf..27b0c40601fb 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -35,7 +35,6 @@
 #include <asm/kdebug.h>
 #include <asm/sstep.h>
-static DECLARE_MUTEX(kprobe_mutex);
 DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
 DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
@@ -54,19 +53,17 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
        /* insn must be on a special executable page on ppc64 */
        if (!ret) {
-                down(&kprobe_mutex);
                p->ainsn.insn = get_insn_slot();
-                up(&kprobe_mutex);
                if (!p->ainsn.insn)
                        ret = -ENOMEM;
        }
-        return ret;
-}
-void __kprobes arch_copy_kprobe(struct kprobe *p)
+        if (!ret) {
-{
+                memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
-        memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+                p->opcode = *p->addr;
-        p->opcode = *p->addr;
+        }
+        return ret;
 }
 void __kprobes arch_arm_kprobe(struct kprobe *p)
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index fc60a773af7d..ba21a6c4f467 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -381,7 +381,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
        dev->subsystem_vendor = get_int_prop(node, "subsystem-vendor-id", 0);
        dev->subsystem_device = get_int_prop(node, "subsystem-id", 0);
-        dev->cfg_size = 256; /*pci_cfg_space_size(dev);*/
+        dev->cfg_size = pci_cfg_space_size(dev);
        sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
                dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index b2758148a0de..16d9a904f3cb 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -244,7 +244,6 @@ EXPORT_SYMBOL(set_context);
 extern long mol_trampoline;
 EXPORT_SYMBOL(mol_trampoline); /* For MOL */
 EXPORT_SYMBOL(flush_hash_pages); /* For MOL */
-EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */
 #ifdef CONFIG_SMP
 extern int mmu_hash_lock;
 EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 45b8109951fe..5579f6559912 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -72,7 +72,7 @@ static int of_device_available(struct device_node * dn)
        return 0;
 }
-static int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
+int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
 {
        int returnval = -1;
        unsigned long buid, addr;
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index e5d285adb496..db72a92943bf 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -299,9 +299,7 @@ void __init setup_arch(char **cmdline_p)
        if (ppc_md.init_early)
                ppc_md.init_early();
-#ifdef CONFIG_SERIAL_8250
        find_legacy_serial_ports();
-#endif
        finish_device_tree();
        smp_setup_cpu_maps();
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 81567e931260..c4b76961d6de 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -472,9 +472,7 @@ void __init setup_system(void)
         * hash table management for us, thus ioremap works. We do that early
         * so that further code can be debugged
         */
-#ifdef CONFIG_SERIAL_8250
        find_legacy_serial_ports();
-#endif
        /*
         * "Finish" the device-tree, that is do the actual parsing of
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 9c921d1c4084..475249dc2350 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -552,30 +552,6 @@ asmlinkage long compat_sys_sched_rr_get_interval(u32 pid, struct compat_timespec
        return ret;
 }
-asmlinkage int compat_sys_pciconfig_read(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
-{
-        return sys_pciconfig_read((unsigned long) bus,
-                                  (unsigned long) dfn,
-                                  (unsigned long) off,
-                                  (unsigned long) len,
-                                  compat_ptr(ubuf));
-}
-asmlinkage int compat_sys_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
-{
-        return sys_pciconfig_write((unsigned long) bus,
-                                   (unsigned long) dfn,
-                                   (unsigned long) off,
-                                   (unsigned long) len,
-                                   compat_ptr(ubuf));
-}
-asmlinkage int compat_sys_pciconfig_iobase(u32 which, u32 in_bus, u32 in_devfn)
-{
-        return sys_pciconfig_iobase(which, in_bus, in_devfn);
-}
 /* Note: it is necessary to treat mode as an unsigned int,
 * with the corresponding cast to a signed int to insure that the 
 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
@@ -956,38 +932,6 @@ long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,
                             advice);
 }
-long ppc32_timer_create(clockid_t clock,
-                        struct compat_sigevent __user *ev32,
-                        timer_t __user *timer_id)
-{
-        sigevent_t event;
-        timer_t t;
-        long err;
-        mm_segment_t savefs;
-        if (ev32 == NULL)
-                return sys_timer_create(clock, NULL, timer_id);
-        if (get_compat_sigevent(&event, ev32))
-                return -EFAULT;
-        if (!access_ok(VERIFY_WRITE, timer_id, sizeof(timer_t)))
-                return -EFAULT;
-        savefs = get_fs();
-        set_fs(KERNEL_DS);
-        /* The __user pointer casts are valid due to the set_fs() */
-        err = sys_timer_create(clock,
-                (sigevent_t __user *) &event,
-                (timer_t __user *) &t);
-        set_fs(savefs);
-        if (err == 0)
-                err = __put_user(t, timer_id);
-        return err;
-}
 asmlinkage long compat_sys_add_key(const char __user *_type,
                              const char __user *_description,
                              const void __user *_payload,
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index 65463a1076e8..68013179a503 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -239,9 +239,9 @@ SYS32ONLY(ftruncate64)
 SYSX(sys_ni_syscall,sys_stat64,sys_stat64)
 SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64)
 SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64)
-COMPAT_SYS(pciconfig_read)
+SYSCALL(pciconfig_read)
-COMPAT_SYS(pciconfig_write)
+SYSCALL(pciconfig_write)
-COMPAT_SYS(pciconfig_iobase)
+SYSCALL(pciconfig_iobase)
 SYSCALL(ni_syscall)
 SYSCALL(getdents64)
 SYSCALL(pivot_root)
@@ -281,7 +281,7 @@ SYSCALL(epoll_create)
 SYSCALL(epoll_ctl)
 SYSCALL(epoll_wait)
 SYSCALL(remap_file_pages)
-SYSX(sys_timer_create,ppc32_timer_create,sys_timer_create)
+SYSX(sys_timer_create,compat_sys_timer_create,sys_timer_create)
 COMPAT_SYS(timer_settime)
 COMPAT_SYS(timer_gettime)
 SYSCALL(timer_getoverrun)
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 2ffca63602c5..7b278d83739e 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -174,7 +174,7 @@ void __iomem * __ioremap(unsigned long addr, unsigned long size,
        pa = addr & PAGE_MASK;
        size = PAGE_ALIGN(addr + size) - pa;
-        if (size == 0)
+        if ((size == 0) || (pa == 0))
                return NULL;
        if (mem_init_done) {
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index d2ba358c6e38..b3962c3a0348 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -138,7 +138,7 @@ static void spufs_prune_dir(struct dentry *dir)
 {
        struct dentry *dentry, *tmp;
        mutex_lock(&dir->d_inode->i_mutex);
-        list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_child) {
+        list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) {
                spin_lock(&dcache_lock);
                spin_lock(&dentry->d_lock);
                if (!(d_unhashed(dentry)) && dentry->d_inode) {
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index dd73e38bfb7d..a1cb4d236720 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -71,9 +71,6 @@
 #define DBG(fmt...)
 #endif
-extern void generic_find_legacy_serial_ports(u64 *physport,
-                unsigned int *default_speed);
 static void maple_restart(char *cmd)
 {
        unsigned int maple_nvram_base;
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 6accdd155505..61616d144072 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_SMP)	+= smp.o
 obj-$(CONFIG_IBMVIO)    += vio.o
 obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
-obj-$(CONFIG_EEH)       += eeh.o eeh_event.o
+obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
 obj-$(CONFIG_HVCS)              += hvcserver.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 7fbfd16d72b7..17cea7f2afd3 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -76,15 +76,14 @@
 */
 #define EEH_MAX_FAILS   100000
-/* Misc forward declaraions */
-static void eeh_save_bars(struct pci_dev * pdev, struct pci_dn *pdn);
 /* RTAS tokens */
 static int ibm_set_eeh_option;
 static int ibm_set_slot_reset;
 static int ibm_read_slot_reset_state;
 static int ibm_read_slot_reset_state2;
 static int ibm_slot_error_detail;
+static int ibm_get_config_addr_info;
+static int ibm_configure_bridge;
 int eeh_subsystem_enabled;
 EXPORT_SYMBOL(eeh_subsystem_enabled);
@@ -98,308 +97,23 @@ static DEFINE_SPINLOCK(slot_errbuf_lock);
 static int eeh_error_buf_size;
 /* System monitoring statistics */
-static DEFINE_PER_CPU(unsigned long, no_device);
+static unsigned long no_device;
-static DEFINE_PER_CPU(unsigned long, no_dn);
+static unsigned long no_dn;
-static DEFINE_PER_CPU(unsigned long, no_cfg_addr);
+static unsigned long no_cfg_addr;
-static DEFINE_PER_CPU(unsigned long, ignored_check);
+static unsigned long ignored_check;
-static DEFINE_PER_CPU(unsigned long, total_mmio_ffs);
+static unsigned long total_mmio_ffs;
-static DEFINE_PER_CPU(unsigned long, false_positives);
+static unsigned long false_positives;
-static DEFINE_PER_CPU(unsigned long, ignored_failures);
+static unsigned long ignored_failures;
-static DEFINE_PER_CPU(unsigned long, slot_resets);
+static unsigned long slot_resets;
-/**
- * The pci address cache subsystem.  This subsystem places
- * PCI device address resources into a red-black tree, sorted
- * according to the address range, so that given only an i/o
- * address, the corresponding PCI device can be **quickly**
- * found. It is safe to perform an address lookup in an interrupt
- * context; this ability is an important feature.
- *
- * Currently, the only customer of this code is the EEH subsystem;
- * thus, this code has been somewhat tailored to suit EEH better.
- * In particular, the cache does *not* hold the addresses of devices
- * for which EEH is not enabled.
- *
- * (Implementation Note: The RB tree seems to be better/faster
- * than any hash algo I could think of for this problem, even
- * with the penalty of slow pointer chases for d-cache misses).
- */
-struct pci_io_addr_range
-{
-        struct rb_node rb_node;
-        unsigned long addr_lo;
-        unsigned long addr_hi;
-        struct pci_dev *pcidev;
-        unsigned int flags;
-};
-static struct pci_io_addr_cache
-{
-        struct rb_root rb_root;
-        spinlock_t piar_lock;
-} pci_io_addr_cache_root;
-static inline struct pci_dev *__pci_get_device_by_addr(unsigned long addr)
-{
-        struct rb_node *n = pci_io_addr_cache_root.rb_root.rb_node;
-        while (n) {
-                struct pci_io_addr_range *piar;
-                piar = rb_entry(n, struct pci_io_addr_range, rb_node);
-                if (addr < piar->addr_lo) {
-                        n = n->rb_left;
-                } else {
-                        if (addr > piar->addr_hi) {
-                                n = n->rb_right;
-                        } else {
-                                pci_dev_get(piar->pcidev);
-                                return piar->pcidev;
-                        }
-                }
-        }
-        return NULL;
-}
-/**
- * pci_get_device_by_addr - Get device, given only address
- * @addr: mmio (PIO) phys address or i/o port number
- *
- * Given an mmio phys address, or a port number, find a pci device
- * that implements this address.  Be sure to pci_dev_put the device
- * when finished.  I/O port numbers are assumed to be offset
- * from zero (that is, they do *not* have pci_io_addr added in).
- * It is safe to call this function within an interrupt.
- */
-static struct pci_dev *pci_get_device_by_addr(unsigned long addr)
-{
-        struct pci_dev *dev;
-        unsigned long flags;
-        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
-        dev = __pci_get_device_by_addr(addr);
-        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
-        return dev;
-}
-#ifdef DEBUG
-/*
- * Handy-dandy debug print routine, does nothing more
- * than print out the contents of our addr cache.
- */
-static void pci_addr_cache_print(struct pci_io_addr_cache *cache)
-{
-        struct rb_node *n;
-        int cnt = 0;
-        n = rb_first(&cache->rb_root);
-        while (n) {
-                struct pci_io_addr_range *piar;
-                piar = rb_entry(n, struct pci_io_addr_range, rb_node);
-                printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s\n",
-                       (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt,
-                       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev));
-                cnt++;
-                n = rb_next(n);
-        }
-}
-#endif
-/* Insert address range into the rb tree. */
-static struct pci_io_addr_range *
-pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
-                      unsigned long ahi, unsigned int flags)
-{
-        struct rb_node **p = &pci_io_addr_cache_root.rb_root.rb_node;
-        struct rb_node *parent = NULL;
-        struct pci_io_addr_range *piar;
-        /* Walk tree, find a place to insert into tree */
-        while (*p) {
-                parent = *p;
-                piar = rb_entry(parent, struct pci_io_addr_range, rb_node);
-                if (ahi < piar->addr_lo) {
-                        p = &parent->rb_left;
-                } else if (alo > piar->addr_hi) {
-                        p = &parent->rb_right;
-                } else {
-                        if (dev != piar->pcidev ||
-                            alo != piar->addr_lo || ahi != piar->addr_hi) {
-                                printk(KERN_WARNING "PIAR: overlapping address range\n");
-                        }
-                        return piar;
-                }
-        }
-        piar = (struct pci_io_addr_range *)kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
-        if (!piar)
-                return NULL;
-        piar->addr_lo = alo;
+#define IS_BRIDGE(class_code) (((class_code)<<16) == PCI_BASE_CLASS_BRIDGE)
-        piar->addr_hi = ahi;
-        piar->pcidev = dev;
-        piar->flags = flags;
-#ifdef DEBUG
-        printk(KERN_DEBUG "PIAR: insert range=[%lx:%lx] dev=%s\n",
-                          alo, ahi, pci_name (dev));
-#endif
-        rb_link_node(&piar->rb_node, parent, p);
-        rb_insert_color(&piar->rb_node, &pci_io_addr_cache_root.rb_root);
-        return piar;
-}
-static void __pci_addr_cache_insert_device(struct pci_dev *dev)
-{
-        struct device_node *dn;
-        struct pci_dn *pdn;
-        int i;
-        int inserted = 0;
-        dn = pci_device_to_OF_node(dev);
-        if (!dn) {
-                printk(KERN_WARNING "PCI: no pci dn found for dev=%s\n", pci_name(dev));
-                return;
-        }
-        /* Skip any devices for which EEH is not enabled. */
-        pdn = PCI_DN(dn);
-        if (!(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
-            pdn->eeh_mode & EEH_MODE_NOCHECK) {
-#ifdef DEBUG
-                printk(KERN_INFO "PCI: skip building address cache for=%s - %s\n",
-                       pci_name(dev), pdn->node->full_name);
-#endif
-                return;
-        }
-        /* The cache holds a reference to the device... */
-        pci_dev_get(dev);
-        /* Walk resources on this device, poke them into the tree */
-        for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                unsigned long start = pci_resource_start(dev,i);
-                unsigned long end = pci_resource_end(dev,i);
-                unsigned int flags = pci_resource_flags(dev,i);
-                /* We are interested only bus addresses, not dma or other stuff */
-                if (0 == (flags & (IORESOURCE_IO | IORESOURCE_MEM)))
-                        continue;
-                if (start == 0 || ~start == 0 || end == 0 || ~end == 0)
-                         continue;
-                pci_addr_cache_insert(dev, start, end, flags);
-                inserted = 1;
-        }
-        /* If there was nothing to add, the cache has no reference... */
-        if (!inserted)
-                pci_dev_put(dev);
-}
-/**
- * pci_addr_cache_insert_device - Add a device to the address cache
- * @dev: PCI device whose I/O addresses we are interested in.
- *
- * In order to support the fast lookup of devices based on addresses,
- * we maintain a cache of devices that can be quickly searched.
- * This routine adds a device to that cache.
- */
-static void pci_addr_cache_insert_device(struct pci_dev *dev)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
-        __pci_addr_cache_insert_device(dev);
-        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
-}
-static inline void __pci_addr_cache_remove_device(struct pci_dev *dev)
-{
-        struct rb_node *n;
-        int removed = 0;
-restart:
-        n = rb_first(&pci_io_addr_cache_root.rb_root);
-        while (n) {
-                struct pci_io_addr_range *piar;
-                piar = rb_entry(n, struct pci_io_addr_range, rb_node);
-                if (piar->pcidev == dev) {
-                        rb_erase(n, &pci_io_addr_cache_root.rb_root);
-                        removed = 1;
-                        kfree(piar);
-                        goto restart;
-                }
-                n = rb_next(n);
-        }
-        /* The cache no longer holds its reference to this device... */
-        if (removed)
-                pci_dev_put(dev);
-}
-/**
- * pci_addr_cache_remove_device - remove pci device from addr cache
- * @dev: device to remove
- *
- * Remove a device from the addr-cache tree.
- * This is potentially expensive, since it will walk
- * the tree multiple times (once per resource).
- * But so what; device removal doesn't need to be that fast.
- */
-static void pci_addr_cache_remove_device(struct pci_dev *dev)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
-        __pci_addr_cache_remove_device(dev);
-        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
-}
-/**
- * pci_addr_cache_build - Build a cache of I/O addresses
- *
- * Build a cache of pci i/o addresses.  This cache will be used to
- * find the pci device that corresponds to a given address.
- * This routine scans all pci busses to build the cache.
- * Must be run late in boot process, after the pci controllers
- * have been scaned for devices (after all device resources are known).
- */
-void __init pci_addr_cache_build(void)
-{
-        struct device_node *dn;
-        struct pci_dev *dev = NULL;
-        if (!eeh_subsystem_enabled)
-                return;
-        spin_lock_init(&pci_io_addr_cache_root.piar_lock);
-        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-                /* Ignore PCI bridges ( XXX why ??) */
-                if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE) {
-                        continue;
-                }
-                pci_addr_cache_insert_device(dev);
-                /* Save the BAR's; firmware doesn't restore these after EEH reset */
-                dn = pci_device_to_OF_node(dev);
-                eeh_save_bars(dev, PCI_DN(dn));
-        }
-#ifdef DEBUG
-        /* Verify tree built up above, echo back the list of addrs. */
-        pci_addr_cache_print(&pci_io_addr_cache_root);
-#endif
-}
 /* --------------------------------------------------------------- */
-/* Above lies the PCI Address Cache. Below lies the EEH event infrastructure */
+/* Below lies the EEH event infrastructure */
 void eeh_slot_error_detail (struct pci_dn *pdn, int severity)
 {
+        int config_addr;
        unsigned long flags;
        int rc;
@@ -407,8 +121,13 @@ void eeh_slot_error_detail (struct pci_dn *pdn, int severity)
        spin_lock_irqsave(&slot_errbuf_lock, flags);
        memset(slot_errbuf, 0, eeh_error_buf_size);
+        /* Use PE configuration address, if present */
+        config_addr = pdn->eeh_config_addr;
+        if (pdn->eeh_pe_config_addr)
+                config_addr = pdn->eeh_pe_config_addr;
        rc = rtas_call(ibm_slot_error_detail,
-                       8, 1, NULL, pdn->eeh_config_addr,
+                       8, 1, NULL, config_addr,
                       BUID_HI(pdn->phb->buid),
                       BUID_LO(pdn->phb->buid), NULL, 0,
                       virt_to_phys(slot_errbuf),
@@ -428,6 +147,7 @@ void eeh_slot_error_detail (struct pci_dn *pdn, int severity)
 static int read_slot_reset_state(struct pci_dn *pdn, int rets[])
 {
        int token, outputs;
+        int config_addr;
        if (ibm_read_slot_reset_state2 != RTAS_UNKNOWN_SERVICE) {
                token = ibm_read_slot_reset_state2;
@@ -438,7 +158,12 @@ static int read_slot_reset_state(struct pci_dn *pdn, int rets[])
                outputs = 3;
        }
-        return rtas_call(token, 3, outputs, rets, pdn->eeh_config_addr,
+        /* Use PE configuration address, if present */
+        config_addr = pdn->eeh_config_addr;
+        if (pdn->eeh_pe_config_addr)
+                config_addr = pdn->eeh_pe_config_addr;
+        return rtas_call(token, 3, outputs, rets, config_addr,
                         BUID_HI(pdn->phb->buid), BUID_LO(pdn->phb->buid));
 }
@@ -462,7 +187,7 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
 /** 
 * Return the "partitionable endpoint" (pe) under which this device lies
 */
-static struct device_node * find_device_pe(struct device_node *dn)
+struct device_node * find_device_pe(struct device_node *dn)
 {
        while ((dn->parent) && PCI_DN(dn->parent) &&
              (PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) {
@@ -485,6 +210,11 @@ static void __eeh_mark_slot (struct device_node *dn, int mode_flag)
                if (PCI_DN(dn)) {
                        PCI_DN(dn)->eeh_mode |= mode_flag;
+                        /* Mark the pci device driver too */
+                        struct pci_dev *dev = PCI_DN(dn)->pcidev;
+                        if (dev && dev->driver)
+                                dev->error_state = pci_channel_io_frozen;
                        if (dn->child)
                                __eeh_mark_slot (dn->child, mode_flag);
                }
@@ -495,6 +225,11 @@ static void __eeh_mark_slot (struct device_node *dn, int mode_flag)
 void eeh_mark_slot (struct device_node *dn, int mode_flag)
 {
        dn = find_device_pe (dn);
+        /* Back up one, since config addrs might be shared */
+        if (PCI_DN(dn) && PCI_DN(dn)->eeh_pe_config_addr)
+                dn = dn->parent;
        PCI_DN(dn)->eeh_mode |= mode_flag;
        __eeh_mark_slot (dn->child, mode_flag);
 }
@@ -516,7 +251,13 @@ void eeh_clear_slot (struct device_node *dn, int mode_flag)
 {
        unsigned long flags;
        spin_lock_irqsave(&confirm_error_lock, flags);
+        
        dn = find_device_pe (dn);
+        
+        /* Back up one, since config addrs might be shared */
+        if (PCI_DN(dn) && PCI_DN(dn)->eeh_pe_config_addr)
+                dn = dn->parent;
        PCI_DN(dn)->eeh_mode &= ~mode_flag;
        PCI_DN(dn)->eeh_check_count = 0;
        __eeh_clear_slot (dn->child, mode_flag);
@@ -544,15 +285,16 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        int rets[3];
        unsigned long flags;
        struct pci_dn *pdn;
+        enum pci_channel_state state;
        int rc = 0;
-        __get_cpu_var(total_mmio_ffs)++;
+        total_mmio_ffs++;
        if (!eeh_subsystem_enabled)
                return 0;
        if (!dn) {
-                __get_cpu_var(no_dn)++;
+                no_dn++;
                return 0;
        }
        pdn = PCI_DN(dn);
@@ -560,7 +302,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        /* Access to IO BARs might get this far and still not want checking. */
        if (!(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
            pdn->eeh_mode & EEH_MODE_NOCHECK) {
-                __get_cpu_var(ignored_check)++;
+                ignored_check++;
 #ifdef DEBUG
                printk ("EEH:ignored check (%x) for %s %s\n", 
                        pdn->eeh_mode, pci_name (dev), dn->full_name);
@@ -568,8 +310,8 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                return 0;
        }
-        if (!pdn->eeh_config_addr) {
+        if (!pdn->eeh_config_addr && !pdn->eeh_pe_config_addr) {
-                __get_cpu_var(no_cfg_addr)++;
+                no_cfg_addr++;
                return 0;
        }
@@ -611,7 +353,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        if (ret != 0) {
                printk(KERN_WARNING "EEH: read_slot_reset_state() failed; rc=%d dn=%s\n",
                       ret, dn->full_name);
-                __get_cpu_var(false_positives)++;
+                false_positives++;
                rc = 0;
                goto dn_unlock;
        }
@@ -620,14 +362,14 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        if (rets[1] != 1) {
                printk(KERN_WARNING "EEH: event on unsupported device, rc=%d dn=%s\n",
                       ret, dn->full_name);
-                __get_cpu_var(false_positives)++;
+                false_positives++;
                rc = 0;
                goto dn_unlock;
        }
        /* If not the kind of error we know about, punt. */
        if (rets[0] != 2 && rets[0] != 4 && rets[0] != 5) {
-                __get_cpu_var(false_positives)++;
+                false_positives++;
                rc = 0;
                goto dn_unlock;
        }
@@ -635,12 +377,12 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        /* Note that config-io to empty slots may fail;
         * we recognize empty because they don't have children. */
        if ((rets[0] == 5) && (dn->child == NULL)) {
-                __get_cpu_var(false_positives)++;
+                false_positives++;
                rc = 0;
                goto dn_unlock;
        }
-        __get_cpu_var(slot_resets)++;
+        slot_resets++;
 
        /* Avoid repeated reports of this failure, including problems
         * with other functions on this device, and functions under
@@ -648,8 +390,13 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        eeh_mark_slot (dn, EEH_MODE_ISOLATED);
        spin_unlock_irqrestore(&confirm_error_lock, flags);
-        eeh_send_failure_event (dn, dev, rets[0], rets[2]);
+        state = pci_channel_io_normal;
-        
+        if ((rets[0] == 2) || (rets[0] == 4))
+                state = pci_channel_io_frozen;
+        if (rets[0] == 5)
+                state = pci_channel_io_perm_failure;
+        eeh_send_failure_event (dn, dev, state, rets[2]);
        /* Most EEH events are due to device driver bugs.  Having
         * a stack trace will help the device-driver authors figure
         * out what happened.  So print that out. */
@@ -685,7 +432,7 @@ unsigned long eeh_check_failure(const volatile void __iomem *token, unsigned lon
        addr = eeh_token_to_phys((unsigned long __force) token);
        dev = pci_get_device_by_addr(addr);
        if (!dev) {
-                __get_cpu_var(no_device)++;
+                no_device++;
                return val;
        }
@@ -716,11 +463,16 @@ eeh_slot_availability(struct pci_dn *pdn)
        if (rc) return rc;
        if (rets[1] == 0) return -1;  /* EEH is not supported */
-        if (rets[0] == 0)  return 0;  /* Oll Korrect */
+        if (rets[0] == 0) return 0;   /* Oll Korrect */
        if (rets[0] == 5) {
                if (rets[2] == 0) return -1; /* permanently unavailable */
                return rets[2]; /* number of millisecs to wait */
        }
+        if (rets[0] == 1)
+                return 250;
+        printk (KERN_ERR "EEH: Slot unavailable: rc=%d, rets=%d %d %d\n",
+                rc, rets[0], rets[1], rets[2]);
        return -1;
 }
@@ -737,6 +489,7 @@ eeh_slot_availability(struct pci_dn *pdn)
 static void
 rtas_pci_slot_reset(struct pci_dn *pdn, int state)
 {
+        int config_addr;
        int rc;
        BUG_ON (pdn==NULL); 
@@ -747,8 +500,13 @@ rtas_pci_slot_reset(struct pci_dn *pdn, int state)
                return;
        }
+        /* Use PE configuration address, if present */
+        config_addr = pdn->eeh_config_addr;
+        if (pdn->eeh_pe_config_addr)
+                config_addr = pdn->eeh_pe_config_addr;
        rc = rtas_call(ibm_set_slot_reset,4,1, NULL,
-                       pdn->eeh_config_addr,
+                       config_addr,
                       BUID_HI(pdn->phb->buid),
                       BUID_LO(pdn->phb->buid),
                       state);
@@ -761,9 +519,11 @@ rtas_pci_slot_reset(struct pci_dn *pdn, int state)
 /** rtas_set_slot_reset -- assert the pci #RST line for 1/4 second
 *  dn -- device node to be reset.
+ *
+ *  Return 0 if success, else a non-zero value.
 */
-void
+int
 rtas_set_slot_reset(struct pci_dn *pdn)
 {
        int i, rc;
@@ -793,10 +553,21 @@ rtas_set_slot_reset(struct pci_dn *pdn)
         * ready to be used; if not, wait for recovery. */
        for (i=0; i<10; i++) {
                rc = eeh_slot_availability (pdn);
-                if (rc <= 0) break;
+                if (rc < 0)
+                        printk (KERN_ERR "EEH: failed (%d) to reset slot %s\n", rc, pdn->node->full_name);
+                if (rc == 0)
+                        return 0;
+                if (rc < 0)
+                        return -1;
                msleep (rc+100);
        }
+        rc = eeh_slot_availability (pdn);
+        if (rc)
+                printk (KERN_ERR "EEH: timeout resetting slot %s\n", pdn->node->full_name);
+        return rc;
 }
 /* ------------------------------------------------------- */
@@ -851,7 +622,7 @@ void eeh_restore_bars(struct pci_dn *pdn)
        if (!pdn) 
                return;
        
-        if (! pdn->eeh_is_bridge)
+        if ((pdn->eeh_mode & EEH_MODE_SUPPORTED) && !IS_BRIDGE(pdn->class_code))
                __restore_bars (pdn);
        dn = pdn->node->child;
@@ -869,30 +640,30 @@ void eeh_restore_bars(struct pci_dn *pdn)
 * PCI devices are added individuallly; but, for the restore,
 * an entire slot is reset at a time.
 */
-static void eeh_save_bars(struct pci_dev * pdev, struct pci_dn *pdn)
+static void eeh_save_bars(struct pci_dn *pdn)
 {
        int i;
-        if (!pdev || !pdn )
+        if (!pdn )
                return;
        
        for (i = 0; i < 16; i++)
-                pci_read_config_dword(pdev, i * 4, &pdn->config_space[i]);
+                rtas_read_config(pdn, i * 4, 4, &pdn->config_space[i]);
-        if (pdev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
-                pdn->eeh_is_bridge = 1;
 }
 void
 rtas_configure_bridge(struct pci_dn *pdn)
 {
-        int token = rtas_token ("ibm,configure-bridge");
+        int config_addr;
        int rc;
-        if (token == RTAS_UNKNOWN_SERVICE)
+        /* Use PE configuration address, if present */
-                return;
+        config_addr = pdn->eeh_config_addr;
-        rc = rtas_call(token,3,1, NULL,
+        if (pdn->eeh_pe_config_addr)
-                       pdn->eeh_config_addr,
+                config_addr = pdn->eeh_pe_config_addr;
+        rc = rtas_call(ibm_configure_bridge,3,1, NULL,
+                       config_addr,
                       BUID_HI(pdn->phb->buid),
                       BUID_LO(pdn->phb->buid));
        if (rc) {
@@ -927,6 +698,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
        int enable;
        struct pci_dn *pdn = PCI_DN(dn);
+        pdn->class_code = 0;
        pdn->eeh_mode = 0;
        pdn->eeh_check_count = 0;
        pdn->eeh_freeze_count = 0;
@@ -943,6 +715,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                pdn->eeh_mode |= EEH_MODE_NOCHECK;
                return NULL;
        }
+        pdn->class_code = *class_code;
        /*
         * Now decide if we are going to "Disable" EEH checking
@@ -953,8 +726,10 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         * But there are a few cases like display devices that make sense.
         */
        enable = 1;     /* i.e. we will do checking */
+#if 0
        if ((*class_code >> 16) == PCI_BASE_CLASS_DISPLAY)
                enable = 0;
+#endif
        if (!enable)
                pdn->eeh_mode |= EEH_MODE_NOCHECK;
@@ -973,8 +748,22 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                        eeh_subsystem_enabled = 1;
                        pdn->eeh_mode |= EEH_MODE_SUPPORTED;
                        pdn->eeh_config_addr = regs[0];
+                        /* If the newer, better, ibm,get-config-addr-info is supported, 
+                         * then use that instead. */
+                        pdn->eeh_pe_config_addr = 0;
+                        if (ibm_get_config_addr_info != RTAS_UNKNOWN_SERVICE) {
+                                unsigned int rets[2];
+                                ret = rtas_call (ibm_get_config_addr_info, 4, 2, rets, 
+                                        pdn->eeh_config_addr, 
+                                        info->buid_hi, info->buid_lo,
+                                        0);
+                                if (ret == 0)
+                                        pdn->eeh_pe_config_addr = rets[0];
+                        }
 #ifdef DEBUG
-                        printk(KERN_DEBUG "EEH: %s: eeh enabled\n", dn->full_name);
+                        printk(KERN_DEBUG "EEH: %s: eeh enabled, config=%x pe_config=%x\n",
+                               dn->full_name, pdn->eeh_config_addr, pdn->eeh_pe_config_addr);
 #endif
                } else {
@@ -993,6 +782,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                       dn->full_name);
        }
+        eeh_save_bars(pdn);
        return NULL;
 }
@@ -1026,6 +816,8 @@ void __init eeh_init(void)
        ibm_read_slot_reset_state2 = rtas_token("ibm,read-slot-reset-state2");
        ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state");
        ibm_slot_error_detail = rtas_token("ibm,slot-error-detail");
+        ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info");
+        ibm_configure_bridge = rtas_token ("ibm,configure-bridge");
        if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE)
                return;
@@ -1080,12 +872,10 @@ void eeh_add_device_early(struct device_node *dn)
        if (!dn || !PCI_DN(dn))
                return;
        phb = PCI_DN(dn)->phb;
-        if (NULL == phb || 0 == phb->buid) {
-                printk(KERN_WARNING "EEH: Expected buid but found none for %s\n",
+        /* USB Bus children of PCI devices will not have BUID's */
-                       dn->full_name);
+        if (NULL == phb || 0 == phb->buid)
-                dump_stack();
                return;
-        }
        info.buid_hi = BUID_HI(phb->buid);
        info.buid_lo = BUID_LO(phb->buid);
@@ -1127,7 +917,6 @@ void eeh_add_device_late(struct pci_dev *dev)
        pdn->pcidev = dev;
        pci_addr_cache_insert_device (dev);
-        eeh_save_bars(dev, pdn);
 }
 EXPORT_SYMBOL_GPL(eeh_add_device_late);
@@ -1175,25 +964,9 @@ EXPORT_SYMBOL_GPL(eeh_remove_bus_device);
 static int proc_eeh_show(struct seq_file *m, void *v)
 {
-        unsigned int cpu;
-        unsigned long ffs = 0, positives = 0, failures = 0;
-        unsigned long resets = 0;
-        unsigned long no_dev = 0, no_dn = 0, no_cfg = 0, no_check = 0;
-        for_each_cpu(cpu) {
-                ffs += per_cpu(total_mmio_ffs, cpu);
-                positives += per_cpu(false_positives, cpu);
-                failures += per_cpu(ignored_failures, cpu);
-                resets += per_cpu(slot_resets, cpu);
-                no_dev += per_cpu(no_device, cpu);
-                no_dn += per_cpu(no_dn, cpu);
-                no_cfg += per_cpu(no_cfg_addr, cpu);
-                no_check += per_cpu(ignored_check, cpu);
-        }
        if (0 == eeh_subsystem_enabled) {
                seq_printf(m, "EEH Subsystem is globally disabled\n");
-                seq_printf(m, "eeh_total_mmio_ffs=%ld\n", ffs);
+                seq_printf(m, "eeh_total_mmio_ffs=%ld\n", total_mmio_ffs);
        } else {
                seq_printf(m, "EEH Subsystem is enabled\n");
                seq_printf(m,
@@ -1205,8 +978,10 @@ static int proc_eeh_show(struct seq_file *m, void *v)
                                "eeh_false_positives=%ld\n"
                                "eeh_ignored_failures=%ld\n"
                                "eeh_slot_resets=%ld\n",
-                                no_dev, no_dn, no_cfg, no_check,
+                                no_device, no_dn, no_cfg_addr, 
-                                ffs, positives, failures, resets);
+                                ignored_check, total_mmio_ffs, 
+                                false_positives, ignored_failures, 
+                                slot_resets);
        }
        return 0;
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
new file mode 100644
index 000000000000..d4a402c5866c
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -0,0 +1,316 @@
+/*
+ * eeh_cache.c
+ * PCI address cache; allows the lookup of PCI devices based on I/O address
+ *
+ * Copyright (C) 2004 Linas Vepstas <linas@austin.ibm.com> IBM 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
+ */
+#include <linux/list.h>
+#include <linux/pci.h>
+#include <linux/rbtree.h>
+#include <linux/spinlock.h>
+#include <asm/atomic.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
+#undef DEBUG
+/**
+ * The pci address cache subsystem.  This subsystem places
+ * PCI device address resources into a red-black tree, sorted
+ * according to the address range, so that given only an i/o
+ * address, the corresponding PCI device can be **quickly**
+ * found. It is safe to perform an address lookup in an interrupt
+ * context; this ability is an important feature.
+ *
+ * Currently, the only customer of this code is the EEH subsystem;
+ * thus, this code has been somewhat tailored to suit EEH better.
+ * In particular, the cache does *not* hold the addresses of devices
+ * for which EEH is not enabled.
+ *
+ * (Implementation Note: The RB tree seems to be better/faster
+ * than any hash algo I could think of for this problem, even
+ * with the penalty of slow pointer chases for d-cache misses).
+ */
+struct pci_io_addr_range
+{
+        struct rb_node rb_node;
+        unsigned long addr_lo;
+        unsigned long addr_hi;
+        struct pci_dev *pcidev;
+        unsigned int flags;
+};
+static struct pci_io_addr_cache
+{
+        struct rb_root rb_root;
+        spinlock_t piar_lock;
+} pci_io_addr_cache_root;
+static inline struct pci_dev *__pci_get_device_by_addr(unsigned long addr)
+{
+        struct rb_node *n = pci_io_addr_cache_root.rb_root.rb_node;
+        while (n) {
+                struct pci_io_addr_range *piar;
+                piar = rb_entry(n, struct pci_io_addr_range, rb_node);
+                if (addr < piar->addr_lo) {
+                        n = n->rb_left;
+                } else {
+                        if (addr > piar->addr_hi) {
+                                n = n->rb_right;
+                        } else {
+                                pci_dev_get(piar->pcidev);
+                                return piar->pcidev;
+                        }
+                }
+        }
+        return NULL;
+}
+/**
+ * pci_get_device_by_addr - Get device, given only address
+ * @addr: mmio (PIO) phys address or i/o port number
+ *
+ * Given an mmio phys address, or a port number, find a pci device
+ * that implements this address.  Be sure to pci_dev_put the device
+ * when finished.  I/O port numbers are assumed to be offset
+ * from zero (that is, they do *not* have pci_io_addr added in).
+ * It is safe to call this function within an interrupt.
+ */
+struct pci_dev *pci_get_device_by_addr(unsigned long addr)
+{
+        struct pci_dev *dev;
+        unsigned long flags;
+        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
+        dev = __pci_get_device_by_addr(addr);
+        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
+        return dev;
+}
+#ifdef DEBUG
+/*
+ * Handy-dandy debug print routine, does nothing more
+ * than print out the contents of our addr cache.
+ */
+static void pci_addr_cache_print(struct pci_io_addr_cache *cache)
+{
+        struct rb_node *n;
+        int cnt = 0;
+        n = rb_first(&cache->rb_root);
+        while (n) {
+                struct pci_io_addr_range *piar;
+                piar = rb_entry(n, struct pci_io_addr_range, rb_node);
+                printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s\n",
+                       (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt,
+                       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev));
+                cnt++;
+                n = rb_next(n);
+        }
+}
+#endif
+/* Insert address range into the rb tree. */
+static struct pci_io_addr_range *
+pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
+                      unsigned long ahi, unsigned int flags)
+{
+        struct rb_node **p = &pci_io_addr_cache_root.rb_root.rb_node;
+        struct rb_node *parent = NULL;
+        struct pci_io_addr_range *piar;
+        /* Walk tree, find a place to insert into tree */
+        while (*p) {
+                parent = *p;
+                piar = rb_entry(parent, struct pci_io_addr_range, rb_node);
+                if (ahi < piar->addr_lo) {
+                        p = &parent->rb_left;
+                } else if (alo > piar->addr_hi) {
+                        p = &parent->rb_right;
+                } else {
+                        if (dev != piar->pcidev ||
+                            alo != piar->addr_lo || ahi != piar->addr_hi) {
+                                printk(KERN_WARNING "PIAR: overlapping address range\n");
+                        }
+                        return piar;
+                }
+        }
+        piar = (struct pci_io_addr_range *)kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
+        if (!piar)
+                return NULL;
+        piar->addr_lo = alo;
+        piar->addr_hi = ahi;
+        piar->pcidev = dev;
+        piar->flags = flags;
+#ifdef DEBUG
+        printk(KERN_DEBUG "PIAR: insert range=[%lx:%lx] dev=%s\n",
+                          alo, ahi, pci_name (dev));
+#endif
+        rb_link_node(&piar->rb_node, parent, p);
+        rb_insert_color(&piar->rb_node, &pci_io_addr_cache_root.rb_root);
+        return piar;
+}
+static void __pci_addr_cache_insert_device(struct pci_dev *dev)
+{
+        struct device_node *dn;
+        struct pci_dn *pdn;
+        int i;
+        int inserted = 0;
+        dn = pci_device_to_OF_node(dev);
+        if (!dn) {
+                printk(KERN_WARNING "PCI: no pci dn found for dev=%s\n", pci_name(dev));
+                return;
+        }
+        /* Skip any devices for which EEH is not enabled. */
+        pdn = PCI_DN(dn);
+        if (!(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
+            pdn->eeh_mode & EEH_MODE_NOCHECK) {
+#ifdef DEBUG
+                printk(KERN_INFO "PCI: skip building address cache for=%s - %s\n",
+                       pci_name(dev), pdn->node->full_name);
+#endif
+                return;
+        }
+        /* The cache holds a reference to the device... */
+        pci_dev_get(dev);
+        /* Walk resources on this device, poke them into the tree */
+        for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                unsigned long start = pci_resource_start(dev,i);
+                unsigned long end = pci_resource_end(dev,i);
+                unsigned int flags = pci_resource_flags(dev,i);
+                /* We are interested only bus addresses, not dma or other stuff */
+                if (0 == (flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+                        continue;
+                if (start == 0 || ~start == 0 || end == 0 || ~end == 0)
+                         continue;
+                pci_addr_cache_insert(dev, start, end, flags);
+                inserted = 1;
+        }
+        /* If there was nothing to add, the cache has no reference... */
+        if (!inserted)
+                pci_dev_put(dev);
+}
+/**
+ * pci_addr_cache_insert_device - Add a device to the address cache
+ * @dev: PCI device whose I/O addresses we are interested in.
+ *
+ * In order to support the fast lookup of devices based on addresses,
+ * we maintain a cache of devices that can be quickly searched.
+ * This routine adds a device to that cache.
+ */
+void pci_addr_cache_insert_device(struct pci_dev *dev)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
+        __pci_addr_cache_insert_device(dev);
+        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
+}
+static inline void __pci_addr_cache_remove_device(struct pci_dev *dev)
+{
+        struct rb_node *n;
+        int removed = 0;
+restart:
+        n = rb_first(&pci_io_addr_cache_root.rb_root);
+        while (n) {
+                struct pci_io_addr_range *piar;
+                piar = rb_entry(n, struct pci_io_addr_range, rb_node);
+                if (piar->pcidev == dev) {
+                        rb_erase(n, &pci_io_addr_cache_root.rb_root);
+                        removed = 1;
+                        kfree(piar);
+                        goto restart;
+                }
+                n = rb_next(n);
+        }
+        /* The cache no longer holds its reference to this device... */
+        if (removed)
+                pci_dev_put(dev);
+}
+/**
+ * pci_addr_cache_remove_device - remove pci device from addr cache
+ * @dev: device to remove
+ *
+ * Remove a device from the addr-cache tree.
+ * This is potentially expensive, since it will walk
+ * the tree multiple times (once per resource).
+ * But so what; device removal doesn't need to be that fast.
+ */
+void pci_addr_cache_remove_device(struct pci_dev *dev)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
+        __pci_addr_cache_remove_device(dev);
+        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
+}
+/**
+ * pci_addr_cache_build - Build a cache of I/O addresses
+ *
+ * Build a cache of pci i/o addresses.  This cache will be used to
+ * find the pci device that corresponds to a given address.
+ * This routine scans all pci busses to build the cache.
+ * Must be run late in boot process, after the pci controllers
+ * have been scaned for devices (after all device resources are known).
+ */
+void __init pci_addr_cache_build(void)
+{
+        struct device_node *dn;
+        struct pci_dev *dev = NULL;
+        spin_lock_init(&pci_io_addr_cache_root.piar_lock);
+        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+                /* Ignore PCI bridges */
+                if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
+                        continue;
+                pci_addr_cache_insert_device(dev);
+                dn = pci_device_to_OF_node(dev);
+                pci_dev_get (dev);  /* matching put is in eeh_remove_device() */
+                PCI_DN(dn)->pcidev = dev;
+        }
+#ifdef DEBUG
+        /* Verify tree built up above, echo back the list of addrs. */
+        pci_addr_cache_print(&pci_io_addr_cache_root);
+#endif
+}
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
new file mode 100644
index 000000000000..6373372932ba
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -0,0 +1,376 @@
+/*
+ * PCI Error Recovery Driver for RPA-compliant PPC64 platform.
+ * Copyright (C) 2004, 2005 Linas Vepstas <linas@linas.org>
+ *
+ * All rights reserved.
+ *
+ * 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, GOOD TITLE or
+ * NON INFRINGEMENT.  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Send feedback to <linas@us.ibm.com>
+ *
+ */
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/notifier.h>
+#include <linux/pci.h>
+#include <asm/eeh.h>
+#include <asm/eeh_event.h>
+#include <asm/ppc-pci.h>
+#include <asm/pci-bridge.h>
+#include <asm/prom.h>
+#include <asm/rtas.h>
+static inline const char * pcid_name (struct pci_dev *pdev)
+{
+        if (pdev->dev.driver)
+                return pdev->dev.driver->name;
+        return "";
+}
+#ifdef DEBUG
+static void print_device_node_tree (struct pci_dn *pdn, int dent)
+{
+        int i;
+        if (!pdn) return;
+        for (i=0;i<dent; i++)
+                printk(" ");
+        printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n",
+                pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr,
+                pdn->eeh_pe_config_addr, pdn->node->full_name);
+        dent += 3;
+        struct device_node *pc = pdn->node->child;
+        while (pc) {
+                print_device_node_tree(PCI_DN(pc), dent);
+                pc = pc->sibling;
+        }
+}
+#endif
+/** 
+ * irq_in_use - return true if this irq is being used 
+ */
+static int irq_in_use(unsigned int irq)
+{
+        int rc = 0;
+        unsigned long flags;
+   struct irq_desc *desc = irq_desc + irq;
+        spin_lock_irqsave(&desc->lock, flags);
+        if (desc->action)
+                rc = 1;
+        spin_unlock_irqrestore(&desc->lock, flags);
+        return rc;
+}
+/* ------------------------------------------------------- */
+/** eeh_report_error - report an EEH error to each device,
+ *  collect up and merge the device responses.
+ */
+static void eeh_report_error(struct pci_dev *dev, void *userdata)
+{
+        enum pci_ers_result rc, *res = userdata;
+        struct pci_driver *driver = dev->driver;
+        dev->error_state = pci_channel_io_frozen;
+        if (!driver)
+                return;
+        if (irq_in_use (dev->irq)) {
+                struct device_node *dn = pci_device_to_OF_node(dev);
+                PCI_DN(dn)->eeh_mode |= EEH_MODE_IRQ_DISABLED;
+                disable_irq_nosync(dev->irq);
+        }
+        if (!driver->err_handler)
+                return;
+        if (!driver->err_handler->error_detected)
+                return;
+        rc = driver->err_handler->error_detected (dev, pci_channel_io_frozen);
+        if (*res == PCI_ERS_RESULT_NONE) *res = rc;
+        if (*res == PCI_ERS_RESULT_NEED_RESET) return;
+        if (*res == PCI_ERS_RESULT_DISCONNECT &&
+             rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;
+}
+/** eeh_report_reset -- tell this device that the pci slot
+ *  has been reset.
+ */
+static void eeh_report_reset(struct pci_dev *dev, void *userdata)
+{
+        struct pci_driver *driver = dev->driver;
+        struct device_node *dn = pci_device_to_OF_node(dev);
+        if (!driver)
+                return;
+        if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {
+                PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;
+                enable_irq(dev->irq);
+        }
+        if (!driver->err_handler)
+                return;
+        if (!driver->err_handler->slot_reset)
+                return;
+        driver->err_handler->slot_reset(dev);
+}
+static void eeh_report_resume(struct pci_dev *dev, void *userdata)
+{
+        struct pci_driver *driver = dev->driver;
+        dev->error_state = pci_channel_io_normal;
+        if (!driver)
+                return;
+        if (!driver->err_handler)
+                return;
+        if (!driver->err_handler->resume)
+                return;
+        driver->err_handler->resume(dev);
+}
+static void eeh_report_failure(struct pci_dev *dev, void *userdata)
+{
+        struct pci_driver *driver = dev->driver;
+        dev->error_state = pci_channel_io_perm_failure;
+        if (!driver)
+                return;
+        if (irq_in_use (dev->irq)) {
+                struct device_node *dn = pci_device_to_OF_node(dev);
+                PCI_DN(dn)->eeh_mode |= EEH_MODE_IRQ_DISABLED;
+                disable_irq_nosync(dev->irq);
+        }
+        if (!driver->err_handler)
+                return;
+        if (!driver->err_handler->error_detected)
+                return;
+        driver->err_handler->error_detected(dev, pci_channel_io_perm_failure);
+}
+/* ------------------------------------------------------- */
+/**
+ * handle_eeh_events -- reset a PCI device after hard lockup.
+ *
+ * pSeries systems will isolate a PCI slot if the PCI-Host
+ * bridge detects address or data parity errors, DMA's
+ * occuring to wild addresses (which usually happen due to
+ * bugs in device drivers or in PCI adapter firmware).
+ * Slot isolations also occur if #SERR, #PERR or other misc
+ * PCI-related errors are detected.
+ *
+ * Recovery process consists of unplugging the device driver
+ * (which generated hotplug events to userspace), then issuing
+ * a PCI #RST to the device, then reconfiguring the PCI config
+ * space for all bridges & devices under this slot, and then
+ * finally restarting the device drivers (which cause a second
+ * set of hotplug events to go out to userspace).
+ */
+/**
+ * eeh_reset_device() -- perform actual reset of a pci slot
+ * Args: bus: pointer to the pci bus structure corresponding
+ *            to the isolated slot. A non-null value will
+ *            cause all devices under the bus to be removed
+ *            and then re-added.
+ *     pe_dn: pointer to a "Partionable Endpoint" device node.
+ *            This is the top-level structure on which pci
+ *            bus resets can be performed.
+ */
+static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)
+{
+        int rc;
+        if (bus)
+                pcibios_remove_pci_devices(bus);
+        /* Reset the pci controller. (Asserts RST#; resets config space).
+         * Reconfigure bridges and devices. Don't try to bring the system
+         * up if the reset failed for some reason. */
+        rc = rtas_set_slot_reset(pe_dn);
+        if (rc)
+                return rc;
+        /* New-style config addrs might be shared across multiple devices,
+         * Walk over all functions on this device */
+        if (pe_dn->eeh_pe_config_addr) {
+                struct device_node *pe = pe_dn->node;
+                pe = pe->parent->child;
+                while (pe) {
+                        struct pci_dn *ppe = PCI_DN(pe);
+                        if (pe_dn->eeh_pe_config_addr == ppe->eeh_pe_config_addr) {
+                                rtas_configure_bridge(ppe);
+                                eeh_restore_bars(ppe);
+                        }
+                        pe = pe->sibling;
+                }
+        } else {
+                rtas_configure_bridge(pe_dn);
+                eeh_restore_bars(pe_dn);
+        }
+        /* Give the system 5 seconds to finish running the user-space
+         * hotplug shutdown scripts, e.g. ifdown for ethernet.  Yes, 
+         * this is a hack, but if we don't do this, and try to bring 
+         * the device up before the scripts have taken it down, 
+         * potentially weird things happen.
+         */
+        if (bus) {
+                ssleep (5);
+                pcibios_add_pci_devices(bus);
+        }
+        return 0;
+}
+/* The longest amount of time to wait for a pci device
+ * to come back on line, in seconds.
+ */
+#define MAX_WAIT_FOR_RECOVERY 15
+void handle_eeh_events (struct eeh_event *event)
+{
+        struct device_node *frozen_dn;
+        struct pci_dn *frozen_pdn;
+        struct pci_bus *frozen_bus;
+        int rc = 0;
+        enum pci_ers_result result = PCI_ERS_RESULT_NONE;
+        frozen_dn = find_device_pe(event->dn);
+        frozen_bus = pcibios_find_pci_bus(frozen_dn);
+        if (!frozen_dn) {
+                printk(KERN_ERR "EEH: Error: Cannot find partition endpoint for %s\n",
+                        pci_name(event->dev));
+                return;
+        }
+        /* There are two different styles for coming up with the PE.
+         * In the old style, it was the highest EEH-capable device
+         * which was always an EADS pci bridge.  In the new style,
+         * there might not be any EADS bridges, and even when there are,
+         * the firmware marks them as "EEH incapable". So another
+         * two-step is needed to find the pci bus.. */
+        if (!frozen_bus)
+                frozen_bus = pcibios_find_pci_bus (frozen_dn->parent);
+        if (!frozen_bus) {
+                printk(KERN_ERR "EEH: Cannot find PCI bus for %s\n",
+                        frozen_dn->full_name);
+                return;
+        }
+#if 0
+        /* We may get "permanent failure" messages on empty slots.
+         * These are false alarms. Empty slots have no child dn. */
+        if ((event->state == pci_channel_io_perm_failure) && (frozen_device == NULL))
+                return;
+#endif
+        frozen_pdn = PCI_DN(frozen_dn);
+        frozen_pdn->eeh_freeze_count++;
+        
+        if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
+                goto hard_fail;
+        /* If the reset state is a '5' and the time to reset is 0 (infinity)
+         * or is more then 15 seconds, then mark this as a permanent failure.
+         */
+        if ((event->state == pci_channel_io_perm_failure) &&
+            ((event->time_unavail <= 0) ||
+             (event->time_unavail > MAX_WAIT_FOR_RECOVERY*1000)))
+                goto hard_fail;
+        eeh_slot_error_detail(frozen_pdn, 1 /* Temporary Error */);
+        printk(KERN_WARNING
+           "EEH: This PCI device has failed %d times since last reboot: %s - %s\n",
+                frozen_pdn->eeh_freeze_count,
+                pci_name (frozen_pdn->pcidev), 
+                pcid_name(frozen_pdn->pcidev));
+        /* Walk the various device drivers attached to this slot through
+         * a reset sequence, giving each an opportunity to do what it needs
+         * to accomplish the reset.  Each child gets a report of the
+         * status ... if any child can't handle the reset, then the entire
+         * slot is dlpar removed and added.
+         */
+        pci_walk_bus(frozen_bus, eeh_report_error, &result);
+        /* If all device drivers were EEH-unaware, then shut
+         * down all of the device drivers, and hope they
+         * go down willingly, without panicing the system.
+         */
+        if (result == PCI_ERS_RESULT_NONE) {
+                rc = eeh_reset_device(frozen_pdn, frozen_bus);
+                if (rc)
+                        goto hard_fail;
+        }
+        /* If any device called out for a reset, then reset the slot */
+        if (result == PCI_ERS_RESULT_NEED_RESET) {
+                rc = eeh_reset_device(frozen_pdn, NULL);
+                if (rc)
+                        goto hard_fail;
+                pci_walk_bus(frozen_bus, eeh_report_reset, 0);
+        }
+        /* If all devices reported they can proceed, the re-enable PIO */
+        if (result == PCI_ERS_RESULT_CAN_RECOVER) {
+                /* XXX Not supported; we brute-force reset the device */
+                rc = eeh_reset_device(frozen_pdn, NULL);
+                if (rc)
+                        goto hard_fail;
+                pci_walk_bus(frozen_bus, eeh_report_reset, 0);
+        }
+        /* Tell all device drivers that they can resume operations */
+        pci_walk_bus(frozen_bus, eeh_report_resume, 0);
+        return;
+        
+hard_fail:
+        /*
+         * About 90% of all real-life EEH failures in the field
+         * are due to poorly seated PCI cards. Only 10% or so are
+         * due to actual, failed cards.
+         */
+        printk(KERN_ERR
+           "EEH: PCI device %s - %s has failed %d times \n"
+           "and has been permanently disabled.  Please try reseating\n"
+           "this device or replacing it.\n",
+                pci_name (frozen_pdn->pcidev), 
+                pcid_name(frozen_pdn->pcidev), 
+                frozen_pdn->eeh_freeze_count);
+        eeh_slot_error_detail(frozen_pdn, 2 /* Permanent Error */);
+        /* Notify all devices that they're about to go down. */
+        pci_walk_bus(frozen_bus, eeh_report_failure, 0);
+        /* Shut down the device drivers for good. */
+        pcibios_remove_pci_devices(frozen_bus);
+}
+/* ---------- end of file ---------- */
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 92497333c2b6..9a9961f27480 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -21,6 +21,7 @@
 #include <linux/list.h>
 #include <linux/pci.h>
 #include <asm/eeh_event.h>
+#include <asm/ppc-pci.h>
 /** Overview:
 *  EEH error states may be detected within exception handlers;
@@ -37,31 +38,6 @@ static void eeh_thread_launcher(void *);
 DECLARE_WORK(eeh_event_wq, eeh_thread_launcher, NULL);
 /**
- * eeh_panic - call panic() for an eeh event that cannot be handled.
- * The philosophy of this routine is that it is better to panic and
- * halt the OS than it is to risk possible data corruption by
- * oblivious device drivers that don't know better.
- *
- * @dev pci device that had an eeh event
- * @reset_state current reset state of the device slot
- */
-static void eeh_panic(struct pci_dev *dev, int reset_state)
-{
-        /*
-         * Since the panic_on_oops sysctl is used to halt the system
-         * in light of potential corruption, we can use it here.
-         */
-        if (panic_on_oops) {
-                panic("EEH: MMIO failure (%d) on device:%s\n", reset_state,
-                      pci_name(dev));
-        }
-        else {
-                printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s\n",
-                       reset_state, pci_name(dev));
-        }
-}
-/**
 * eeh_event_handler - dispatch EEH events.  The detection of a frozen
 * slot can occur inside an interrupt, where it can be hard to do
 * anything about it.  The goal of this routine is to pull these
@@ -82,10 +58,16 @@ static int eeh_event_handler(void * dummy)
                spin_lock_irqsave(&eeh_eventlist_lock, flags);
                event = NULL;
+                /* Unqueue the event, get ready to process. */
                if (!list_empty(&eeh_eventlist)) {
                        event = list_entry(eeh_eventlist.next, struct eeh_event, list);
                        list_del(&event->list);
                }
+                
+                if (event)
+                        eeh_mark_slot(event->dn, EEH_MODE_RECOVERING);
                spin_unlock_irqrestore(&eeh_eventlist_lock, flags);
                if (event == NULL)
                        break;
@@ -93,8 +75,11 @@ static int eeh_event_handler(void * dummy)
                printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",
                       pci_name(event->dev));
-                eeh_panic (event->dev, event->state);
+                handle_eeh_events(event);
+                eeh_clear_slot(event->dn, EEH_MODE_RECOVERING);
+                pci_dev_put(event->dev);
                kfree(event);
        }
@@ -122,7 +107,7 @@ static void eeh_thread_launcher(void *dummy)
 */
 int eeh_send_failure_event (struct device_node *dn,
                            struct pci_dev *dev,
-                            int state,
+                            enum pci_channel_state state,
                            int time_unavail)
 {
        unsigned long flags;
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index e719a4933af1..98e940beeb3b 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -128,10 +128,9 @@ TOUT	:= .tmp_gas_check
 # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec
 # instructions.
 # gcc-3.4 and binutils-2.14 are a fatal combination.
-GCC_VERSION     := $(call cc-version)
 checkbin:
-        @if test "$(GCC_VERSION)" = "0304" ; then \
+        @if test "$(call cc-version)" = "0304" ; then \
                if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \
                        echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \
                        echo 'correctly with gcc-3.4 and your version of binutils.'; \
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c
index a882b0dbe8de..84d65a87191e 100644
--- a/arch/ppc/kernel/machine_kexec.c
+++ b/arch/ppc/kernel/machine_kexec.c
@@ -28,12 +28,6 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
 const extern unsigned char relocate_new_kernel[];
 const extern unsigned int relocate_new_kernel_size;
-/*
- * Provide a dummy crash_notes definition while crash dump arrives to ppc.
- * This prevents breakage of crash_notes attribute in kernel/ksysfs.c.
- */
-note_buf_t crash_notes[NR_CPUS];
 void machine_shutdown(void)
 {
        if (ppc_md.machine_shutdown)
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6fe532d82417..b66602ad7b33 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -27,11 +27,6 @@ config S390
        bool
        default y
-config UID16
-        bool
-        default y
-        depends on !64BIT
 source "init/Kconfig"
 menu "Base setup"
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 4865e4b49464..9269b5788fac 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -17,8 +17,7 @@ obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_COMPAT)            += compat_linux.o compat_signal.o \
-                                        compat_ioctl.o compat_wrapper.o \
+                                        compat_wrapper.o compat_exec_domain.o
-                                        compat_exec_domain.o
 obj-$(CONFIG_BINFMT_ELF32)      += binfmt_elf32.o
 obj-$(CONFIG_VIRT_TIMER)        += vtime.o
diff --git a/arch/s390/kernel/compat_ioctl.c b/arch/s390/kernel/compat_ioctl.c
deleted file mode 100644
index 6504c4e69986..000000000000
--- a/arch/s390/kernel/compat_ioctl.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
- *
- *  S390 version
- *    Copyright (C) 2000-2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Gerhard Tonn (ton@de.ibm.com)
- *               Arnd Bergmann (arndb@de.ibm.com)
- *
- * Original implementation from 32-bit Sparc compat code which is
- * Copyright (C) 2000 Silicon Graphics, Inc.
- * Written by Ulf Carlsson (ulfc@engr.sgi.com) 
- */
-#include "compat_linux.h"
-#define INCLUDES
-#define CODE
-#include "../../../fs/compat_ioctl.c"
-#include <asm/dasd.h>
-#include <asm/cmb.h>
-#include <asm/tape390.h>
-#include <asm/ccwdev.h>
-#include "../../../drivers/s390/char/raw3270.h"
-static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,
-                                unsigned long arg, struct file *f)
-{
-        return sys_ioctl(fd, cmd, (unsigned long)compat_ptr(arg));
-}
-static int do_ioctl32_ulong(unsigned int fd, unsigned int cmd,
-                                unsigned long arg, struct file *f)
-{
-        return sys_ioctl(fd, cmd, arg);
-}
-#define COMPATIBLE_IOCTL(cmd)           HANDLE_IOCTL((cmd),(ioctl_trans_handler_t)do_ioctl32_pointer)
-#define ULONG_IOCTL(cmd)                HANDLE_IOCTL((cmd),(ioctl_trans_handler_t)do_ioctl32_ulong)
-#define HANDLE_IOCTL(cmd,handler)       { (cmd), (ioctl_trans_handler_t)(handler), NULL },
-struct ioctl_trans ioctl_start[] = {
-/* architecture independent ioctls */
-#include <linux/compat_ioctl.h>
-#define DECLARES
-#include "../../../fs/compat_ioctl.c"
-/* s390 only ioctls */
-COMPATIBLE_IOCTL(DASDAPIVER)
-COMPATIBLE_IOCTL(BIODASDDISABLE)
-COMPATIBLE_IOCTL(BIODASDENABLE)
-COMPATIBLE_IOCTL(BIODASDRSRV)
-COMPATIBLE_IOCTL(BIODASDRLSE)
-COMPATIBLE_IOCTL(BIODASDSLCK)
-COMPATIBLE_IOCTL(BIODASDINFO)
-COMPATIBLE_IOCTL(BIODASDINFO2)
-COMPATIBLE_IOCTL(BIODASDFMT)
-COMPATIBLE_IOCTL(BIODASDPRRST)
-COMPATIBLE_IOCTL(BIODASDQUIESCE)
-COMPATIBLE_IOCTL(BIODASDRESUME)
-COMPATIBLE_IOCTL(BIODASDPRRD)
-COMPATIBLE_IOCTL(BIODASDPSRD)
-COMPATIBLE_IOCTL(BIODASDGATTR)
-COMPATIBLE_IOCTL(BIODASDSATTR)
-COMPATIBLE_IOCTL(BIODASDCMFENABLE)
-COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
-COMPATIBLE_IOCTL(BIODASDREADALLCMB)
-COMPATIBLE_IOCTL(TUBICMD)
-COMPATIBLE_IOCTL(TUBOCMD)
-COMPATIBLE_IOCTL(TUBGETI)
-COMPATIBLE_IOCTL(TUBGETO)
-COMPATIBLE_IOCTL(TUBSETMOD)
-COMPATIBLE_IOCTL(TUBGETMOD)
-COMPATIBLE_IOCTL(TAPE390_DISPLAY)
-/* s390 doesn't need handlers here */
-COMPATIBLE_IOCTL(TIOCGSERIAL)
-COMPATIBLE_IOCTL(TIOCSSERIAL)
-};
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 41b197a3f3a3..cd3b3c3e7a9f 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -1014,38 +1014,6 @@ asmlinkage long sys32_clone(struct pt_regs regs)
 }
 /*
- * Wrapper function for sys_timer_create.
- */
-extern asmlinkage long
-sys_timer_create(clockid_t, struct sigevent *, timer_t *);
-asmlinkage long
-sys32_timer_create(clockid_t which_clock, struct compat_sigevent *se32,
-                timer_t *timer_id)
-{
-        struct sigevent se;
-        timer_t ktimer_id;
-        mm_segment_t old_fs;
-        long ret;
-        if (se32 == NULL)
-                return sys_timer_create(which_clock, NULL, timer_id);
-        if (get_compat_sigevent(&se, se32))
-                return -EFAULT;
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        ret = sys_timer_create(which_clock, &se, &ktimer_id);
-        set_fs(old_fs);
-        if (!ret)
-                ret = put_user (ktimer_id, timer_id);
-        return ret;
-}
-/*
 * 31 bit emulation wrapper functions for sys_fadvise64/fadvise64_64.
 * These need to rewrite the advise values for POSIX_FADV_{DONTNEED,NOREUSE}
 * because the 31 bit values differ from the 64 bit values.
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 23fe94e58688..cfde1905d07d 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1289,7 +1289,7 @@ sys32_timer_create_wrapper:
        lgfr    %r2,%r2                 # timer_t (int)
        llgtr   %r3,%r3                 # struct compat_sigevent *
        llgtr   %r4,%r4                 # timer_t *
-        jg      sys32_timer_create
+        jg      compat_sys_timer_create
        .globl  sys32_timer_settime_wrapper
 sys32_timer_settime_wrapper:
diff --git a/arch/s390/kernel/crash.c b/arch/s390/kernel/crash.c
index 7bd169c58b0c..926cceeae0fa 100644
--- a/arch/s390/kernel/crash.c
+++ b/arch/s390/kernel/crash.c
@@ -10,8 +10,6 @@
 #include <linux/threads.h>
 #include <linux/kexec.h>
-note_buf_t crash_notes[NR_CPUS];
 void machine_crash_shutdown(struct pt_regs *regs)
 {
 }
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index a942bf2d58e9..7dd58f8ac6b5 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -352,27 +352,6 @@ int dump_fpu (struct pt_regs * regs, s390_fp_regs *fpregs)
        return 1;
 }
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-/* changed the size calculations - should hopefully work better. lbt */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = regs->gprs[15] & ~(PAGE_SIZE - 1);
-        dump->u_tsize = current->mm->end_code >> PAGE_SHIFT;
-        dump->u_dsize = (current->mm->brk + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-        if (dump->start_stack < TASK_SIZE)
-                dump->u_ssize = (TASK_SIZE - dump->start_stack) >> PAGE_SHIFT;
-        memcpy(&dump->regs, regs, sizeof(s390_regs));
-        dump_fpu (regs, &dump->regs.fp_regs);
-        dump->regs.per_info = current->thread.per_info;
-}
 unsigned long get_wchan(struct task_struct *p)
 {
        struct stack_frame *sf, *low, *high;
diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index bee654abb6d3..4176c77670c4 100644
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -10,7 +10,6 @@
 #include <linux/smp.h>
 #include <linux/syscalls.h>
 #include <linux/interrupt.h>
-#include <linux/ioctl32.h>
 #include <asm/checksum.h>
 #include <asm/cpcmd.h>
 #include <asm/delay.h>
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index fd4f240b833d..8a2bea34ddd2 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -305,26 +305,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
        return 0;
 }
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        dump->magic = CMAGIC;
-        dump->start_code = current->mm->start_code;
-        dump->start_data  = current->mm->start_data;
-        dump->start_stack = regs->regs[15] & ~(PAGE_SIZE - 1);
-        dump->u_tsize = (current->mm->end_code - dump->start_code) >> PAGE_SHIFT;
-        dump->u_dsize = (current->mm->brk + (PAGE_SIZE-1) - dump->start_data) >> PAGE_SHIFT;
-        dump->u_ssize = (current->mm->start_stack - dump->start_stack +
-                         PAGE_SIZE - 1) >> PAGE_SHIFT;
-        /* Debug registers will come here. */
-        dump->regs = *regs;
-        dump->u_fpvalid = dump_fpu(regs, &dump->fpu);
-}
 /* Tracing by user break controller.  */
 static void
 ubc_set_tracing(int asid, unsigned long pc)
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 6954fd62470a..1cf94a618be3 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -21,14 +21,12 @@
 #include <asm/cacheflush.h>
 #include <asm/checksum.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 extern struct hw_interrupt_type no_irq_type;
 EXPORT_SYMBOL(sh_mv);
 /* platform dependent support */
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(enable_irq);
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index fb35b45dc130..07b172deb872 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -17,10 +17,6 @@ config MMU
        bool
        default y
-config UID16
-        bool
-        default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c
index b95d04141855..419b5a710441 100644
--- a/arch/sh64/kernel/process.c
+++ b/arch/sh64/kernel/process.c
@@ -775,26 +775,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
        return 0;
 }
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        dump->magic = CMAGIC;
-        dump->start_code = current->mm->start_code;
-        dump->start_data  = current->mm->start_data;
-        dump->start_stack = regs->regs[15] & ~(PAGE_SIZE - 1);
-        dump->u_tsize = (current->mm->end_code - dump->start_code) >> PAGE_SHIFT;
-        dump->u_dsize = (current->mm->brk + (PAGE_SIZE-1) - dump->start_data) >> PAGE_SHIFT;
-        dump->u_ssize = (current->mm->start_stack - dump->start_stack +
-                         PAGE_SIZE - 1) >> PAGE_SHIFT;
-        /* Debug registers will come here. */
-        dump->regs = *regs;
-        dump->u_fpvalid = dump_fpu(regs, &dump->fpu);
-}
 asmlinkage int sys_fork(unsigned long r2, unsigned long r3,
                        unsigned long r4, unsigned long r5,
                        unsigned long r6, unsigned long r7,
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c
index 0b5497d70bd3..472b450e61be 100644
--- a/arch/sh64/kernel/sh_ksyms.c
+++ b/arch/sh64/kernel/sh_ksyms.c
@@ -29,7 +29,6 @@
 #include <asm/delay.h>
 #include <asm/irq.h>
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 #if 0
@@ -41,7 +40,6 @@ EXPORT_SYMBOL(drive_info);
 #endif
 /* platform dependent support */
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(enable_irq);
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 1c8fd0fd9305..0b0d492c953b 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -82,8 +82,6 @@ extern int __lshrdi3(int, int);
 extern int __muldi3(int, int);
 extern int __divdi3(int, int);
-extern void dump_thread(struct pt_regs *, struct user *);
 /* Private functions with odd calling conventions. */
 extern void ___atomic24_add(void);
 extern void ___atomic24_sub(void);
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index 6f00ab8b9d23..83d67eb18895 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -16,7 +16,7 @@ obj-y		:= process.o setup.o cpu.o idprom.o \
 obj-$(CONFIG_PCI)        += ebus.o isa.o pci_common.o pci_iommu.o \
                            pci_psycho.o pci_sabre.o pci_schizo.o
 obj-$(CONFIG_SMP)        += smp.o trampoline.o
-obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o ioctl32.o
+obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o
 obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o
 obj-$(CONFIG_BINFMT_AOUT32) += binfmt_aout32.o
 obj-$(CONFIG_MODULES) += module.o
@@ -40,5 +40,3 @@ endif
 head.o: head.S ttable.S itlb_base.S dtlb_base.S dtlb_backend.S dtlb_prot.S \
        etrap.S rtrap.S winfixup.S entry.S
-CFLAGS_ioctl32.o += -Ifs/
diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c
index edf52d06b280..202a80c24b6f 100644
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
@@ -36,8 +36,6 @@ static int load_aout32_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout32_library(struct file*);
 static int aout32_core_dump(long signr, struct pt_regs * regs, struct file *file);
-extern void dump_thread(struct pt_regs *, struct user *);
 static struct linux_binfmt aout32_format = {
        NULL, THIS_MODULE, load_aout32_binary, load_aout32_library, aout32_core_dump,
        PAGE_SIZE
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c
deleted file mode 100644
index 196b208665a2..000000000000
--- a/arch/sparc64/kernel/ioctl32.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id: ioctl32.c,v 1.136 2002/01/14 09:49:52 davem Exp $
- * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
- *
- * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
- * Copyright (C) 1998  Eddie C. Dost  (ecd@skynet.be)
- * Copyright (C) 2003  Pavel Machek (pavel@suse.cz)
- *
- * These routines maintain argument size conversion between 32bit and 64bit
- * ioctls.
- */
-#define INCLUDES
-#include "compat_ioctl.c"
-#include <linux/syscalls.h>
-#define CODE
-#include "compat_ioctl.c"
-#define COMPATIBLE_IOCTL(cmd)           HANDLE_IOCTL((cmd),sys_ioctl)
-#define HANDLE_IOCTL(cmd,handler)       { (cmd), (ioctl_trans_handler_t)(handler), NULL },
-#define IOCTL_TABLE_START \
-        struct ioctl_trans ioctl_start[] = {
-#define IOCTL_TABLE_END \
-        };
-IOCTL_TABLE_START
-#include <linux/compat_ioctl.h>
-#define DECLARES
-#include "compat_ioctl.c"
-#if 0
-HANDLE_IOCTL(RTC32_IRQP_READ, do_rtc_ioctl)
-HANDLE_IOCTL(RTC32_IRQP_SET, do_rtc_ioctl)
-HANDLE_IOCTL(RTC32_EPOCH_READ, do_rtc_ioctl)
-HANDLE_IOCTL(RTC32_EPOCH_SET, do_rtc_ioctl)
-#endif
-/* take care of sizeof(sizeof()) breakage */
-IOCTL_TABLE_END
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c
index a97b0f0727ab..ff5e9d5cad50 100644
--- a/arch/sparc64/kernel/kprobes.c
+++ b/arch/sparc64/kernel/kprobes.c
@@ -43,14 +43,10 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
-        return 0;
-}
-void __kprobes arch_copy_kprobe(struct kprobe *p)
-{
        p->ainsn.insn[0] = *p->addr;
        p->ainsn.insn[1] = BREAKPOINT_INSTRUCTION_2;
        p->opcode = *p->addr;
+        return 0;
 }
 void __kprobes arch_arm_kprobe(struct kprobe *p)
@@ -65,10 +61,6 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
        flushi(p->addr);
 }
-void __kprobes arch_remove_kprobe(struct kprobe *p)
-{
-}
 static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
        kcb->prev_kprobe.kp = kprobe_running();
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index fb7a5370dbfc..d177d7e5c9d3 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -94,7 +94,6 @@ extern void (*prom_palette)(int);
 extern int __ashrdi3(int, int);
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs);
 extern unsigned long phys_base;
@@ -241,7 +240,6 @@ EXPORT_SYMBOL(io_remap_pfn_range);
 EXPORT_SYMBOL(_sigpause_common);
 EXPORT_SYMBOL(verify_compat_iovec);
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(pte_alloc_one_kernel);
 #ifndef CONFIG_SMP
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 7f6239ed2521..de342ee3116b 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -1120,39 +1120,3 @@ long sys32_lookup_dcookie(unsigned long cookie_high,
        return sys_lookup_dcookie((cookie_high << 32) | cookie_low,
                                  buf, len);
 }
-extern asmlinkage long
-sys_timer_create(clockid_t which_clock,
-                 struct sigevent __user *timer_event_spec,
-                 timer_t __user *created_timer_id);
-long
-sys32_timer_create(u32 clock, struct compat_sigevent __user *se32,
-                   timer_t __user *timer_id)
-{
-        struct sigevent se;
-        mm_segment_t oldfs;
-        timer_t t;
-        long err;
-        if (se32 == NULL)
-                return sys_timer_create(clock, NULL, timer_id);
-        if (get_compat_sigevent(&se, se32))
-                return -EFAULT;
-        if (!access_ok(VERIFY_WRITE,timer_id,sizeof(timer_t)))
-                return -EFAULT;
-        oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        err = sys_timer_create(clock,
-                               (struct sigevent __user *) &se,
-                               (timer_t __user *) &t);
-        set_fs(oldfs);
-        if (!err)
-                err = __put_user (t, timer_id);
-        return err;
-}
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 53eaf2345fe9..98d24bc00044 100644
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -73,7 +73,7 @@ sys_call_table32:
 /*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
        .word sys_ni_syscall, sys32_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
 /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
-        .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
+        .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
 /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
        .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
 /*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
@@ -98,7 +98,7 @@ sys_call_table:
        .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid
 /*50*/  .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl
        .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve
-/*60*/  .word sys_umask, sys_chroot, sys_newfstat, sys_stat64, sys_getpagesize
+/*60*/  .word sys_umask, sys_chroot, sys_newfstat, sys_fstat64, sys_getpagesize
        .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall
 /*70*/  .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect
        .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index cd13b91b9ff6..ab0d0b170816 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -186,9 +186,6 @@ static void tty_receive_char(struct tty_struct *tty, char ch)
                }
        }
-        if((tty->flip.flag_buf_ptr == NULL) ||
-           (tty->flip.char_buf_ptr == NULL))
-                return;
        tty_insert_flip_char(tty, ch, TTY_NORMAL);
 }
@@ -653,8 +650,7 @@ void chan_interrupt(struct list_head *chans, struct work_struct *task,
                chan = list_entry(ele, struct chan, list);
                if(!chan->input || (chan->ops->read == NULL)) continue;
                do {
-                        if((tty != NULL) &&
+                        if (tty && !tty_buffer_request_room(tty, 1)) {
-                           (tty->flip.count >= TTY_FLIPBUF_SIZE)){
                                schedule_delayed_work(task, 1);
                                goto out;
                        }
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 11f518a7e156..8fa2ae7f3026 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -99,7 +99,8 @@ void uml_idle_timer(void)
        set_interval(ITIMER_REAL);
 }
-extern int do_posix_clock_monotonic_gettime(struct timespec *tp);
+extern void ktime_get_ts(struct timespec *ts);
+#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
 void time_init(void)
 {
@@ -114,8 +115,8 @@ void time_init(void)
        wall_to_monotonic.tv_nsec = -now.tv_nsec;
 }
-/* Declared in linux/time.h, which can't be included here */
+/* Defined in linux/ktimer.h, which can't be included here */
-extern void clock_was_set(void);
+#define clock_was_set()         do { } while (0)
 void do_gettimeofday(struct timeval *tv)
 {
diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c
index 39cf247cdae4..062ffa0a9998 100644
--- a/arch/v850/kernel/process.c
+++ b/arch/v850/kernel/process.c
@@ -164,30 +164,6 @@ int copy_thread (int nr, unsigned long clone_flags,
 }
 /*
- * fill in the user structure for a core dump..
- */
-void dump_thread (struct pt_regs *regs, struct user *dump)
-{
-#if 0  /* Later.  XXX */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = regs->gpr[GPR_SP];
-        dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
-        dump->u_dsize = ((unsigned long) (current->mm->brk +
-                                          (PAGE_SIZE-1))) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-        if (dump->start_stack < TASK_SIZE)
-                dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
-        dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
-        dump->regs = *regs;
-        dump->u_fpvalid = 0;
-#endif
-}
-/*
 * sys_execve() executes a new program.
 */
 int sys_execve (char *name, char **argv, char **envp, struct pt_regs *regs)
diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c
index 0ca64900dd91..8ffc29c1c89d 100644
--- a/arch/v850/kernel/v850_ksyms.c
+++ b/arch/v850/kernel/v850_ksyms.c
@@ -21,8 +21,6 @@ extern void *trap_table;
 EXPORT_SYMBOL (trap_table);
 /* platform dependent support */
-extern void dump_thread (struct pt_regs *, struct user *);
-EXPORT_SYMBOL (dump_thread);
 EXPORT_SYMBOL (kernel_thread);
 EXPORT_SYMBOL (enable_irq);
 EXPORT_SYMBOL (disable_irq);
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 4f3e925962c3..348b4a0d0d6f 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -399,17 +399,6 @@ config X86_MCE_AMD
           Additional support for AMD specific MCE features such as
           the DRAM Error Threshold.
-config PHYSICAL_START
-        hex "Physical address where the kernel is loaded" if EMBEDDED
-        default "0x100000"
-        help
-          This gives the physical address where the kernel is loaded.
-          Primarily used in the case of kexec on panic where the
-          fail safe kernel needs to run at a different address than
-          the panic-ed kernel.
-          Don't change this unless you know what you are doing.
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@ -427,6 +416,31 @@ config KEXEC
          support.  As of this writing the exact hardware interface is
          strongly in flux, so no good recommendation can be made.
+config CRASH_DUMP
+        bool "kernel crash dumps (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        help
+                Generate crash dump after being started by kexec.
+config PHYSICAL_START
+        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+        default "0x1000000" if CRASH_DUMP
+        default "0x100000"
+        help
+          This gives the physical address where the kernel is loaded. Normally
+          for regular kernels this value is 0x100000 (1MB). But in the case
+          of kexec on panic the fail safe kernel needs to run at a different
+          address than the panic-ed kernel. This option is used to set the load
+          address for kernels used to capture crash dump on being kexec'ed
+          after panic. The default value for crash dump kernels is
+          0x1000000 (16MB). This can also be set based on the "X" value as
+          specified in the "crashkernel=YM@XM" command line boot parameter
+          passed to the panic-ed kernel. Typically this parameter is set as
+          crashkernel=64M@16M. Please take a look at
+          Documentation/kdump/kdump.txt for more details about crash dumps.
+          Don't change this unless you know what you are doing.
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
        depends on PROC_FS
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index a9cd42e61828..51d83288d62b 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -80,9 +80,12 @@ bzlilo: vmlinux
 bzdisk: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk
-install fdimage fdimage144 fdimage288: vmlinux
+fdimage fdimage144 fdimage288: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
+install:
+        $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile
index 18c6e915d69b..29f8396ed151 100644
--- a/arch/x86_64/boot/Makefile
+++ b/arch/x86_64/boot/Makefile
@@ -98,5 +98,5 @@ zlilo: $(BOOTIMAGE)
        cp System.map $(INSTALL_PATH)/
        if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
-install: $(BOOTIMAGE)
+install:
        sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
diff --git a/arch/x86_64/boot/install.sh b/arch/x86_64/boot/install.sh
index 198af15a7758..baaa2369bdb8 100644
--- a/arch/x86_64/boot/install.sh
+++ b/arch/x86_64/boot/install.sh
@@ -1,40 +1,2 @@
 #!/bin/sh
-#
+. $srctree/arch/i386/boot/install.sh
-# arch/x86_64/boot/install.sh
-#
-# 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) 1995 by Linus Torvalds
-#
-# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
-#
-# "make install" script for i386 architecture
-#
-# Arguments:
-#   $1 - kernel version
-#   $2 - kernel image file
-#   $3 - kernel map file
-#   $4 - default install path (blank if root directory)
-#
-# User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
-# Default install - same as make zlilo
-if [ -f $4/vmlinuz ]; then
-        mv $4/vmlinuz $4/vmlinuz.old
-fi
-if [ -f $4/System.map ]; then
-        mv $4/System.map $4/System.old
-fi
-cat $2 > $4/vmlinuz
-cp $3 $4/System.map
-if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile
index f76217d8f579..051608d55920 100644
--- a/arch/x86_64/ia32/Makefile
+++ b/arch/x86_64/ia32/Makefile
@@ -2,8 +2,7 @@
 # Makefile for the ia32 kernel emulation subsystem.
 #
-obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_ioctl.o \
+obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \
-        ia32_signal.o tls32.o \
        ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o
 sysv-$(CONFIG_SYSVIPC) := ipc32.o
@@ -29,4 +28,3 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
 AFLAGS_vsyscall-sysenter.o = -m32
 AFLAGS_vsyscall-syscall.o = -m32
-CFLAGS_ia32_ioctl.o += -Ifs/
diff --git a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c
deleted file mode 100644
index e335bd0b637d..000000000000
--- a/arch/x86_64/ia32/ia32_ioctl.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $Id: ia32_ioctl.c,v 1.25 2002/10/11 07:17:06 ak Exp $
- * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
- *
- * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
- * Copyright (C) 1998  Eddie C. Dost  (ecd@skynet.be)
- * Copyright (C) 2001,2002  Andi Kleen, SuSE Labs 
- *
- * These routines maintain argument size conversion between 32bit and 64bit
- * ioctls.
- */
-#define INCLUDES
-#include <linux/syscalls.h>
-#include "compat_ioctl.c"
-#include <asm/ia32.h>
-#define CODE
-#include "compat_ioctl.c"
-  
-#define RTC_IRQP_READ32 _IOR('p', 0x0b, unsigned int)    /* Read IRQ rate   */
-#define RTC_IRQP_SET32  _IOW('p', 0x0c, unsigned int)    /* Set IRQ rate    */
-#define RTC_EPOCH_READ32        _IOR('p', 0x0d, unsigned)        /* Read epoch      */
-#define RTC_EPOCH_SET32         _IOW('p', 0x0e, unsigned)        /* Set epoch       */
-static int rtc32_ioctl(unsigned fd, unsigned cmd, unsigned long arg) 
-{ 
-        unsigned long val;
-        mm_segment_t oldfs = get_fs(); 
-        int ret; 
-        
-        switch (cmd) { 
-        case RTC_IRQP_READ32: 
-                set_fs(KERNEL_DS); 
-                ret = sys_ioctl(fd, RTC_IRQP_READ, (unsigned long)&val); 
-                set_fs(oldfs); 
-                if (!ret)
-                        ret = put_user(val, (unsigned int __user *) arg); 
-                return ret; 
-        case RTC_IRQP_SET32: 
-                cmd = RTC_IRQP_SET; 
-                break; 
-        case RTC_EPOCH_READ32:
-                set_fs(KERNEL_DS); 
-                ret = sys_ioctl(fd, RTC_EPOCH_READ, (unsigned long) &val); 
-                set_fs(oldfs); 
-                if (!ret)
-                        ret = put_user(val, (unsigned int __user *) arg); 
-                return ret; 
-        case RTC_EPOCH_SET32:
-                cmd = RTC_EPOCH_SET; 
-                break; 
-        } 
-        return sys_ioctl(fd,cmd,arg); 
-} 
-#define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl_trans_handler_t)(handler) }, 
-#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd,sys_ioctl)
-struct ioctl_trans ioctl_start[] = { 
-#include <linux/compat_ioctl.h>
-#define DECLARES
-#include "compat_ioctl.c"
-/* And these ioctls need translation */
-/* realtime device */
-HANDLE_IOCTL(RTC_IRQP_READ,  rtc32_ioctl)
-HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl)
-HANDLE_IOCTL(RTC_IRQP_SET32, rtc32_ioctl)
-HANDLE_IOCTL(RTC_EPOCH_READ32, rtc32_ioctl)
-HANDLE_IOCTL(RTC_EPOCH_SET32, rtc32_ioctl)
-/* take care of sizeof(sizeof()) breakage */
-}; 
-int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 1f0ff5adc80e..2ff07b47ea9c 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -608,7 +608,7 @@ ia32_sys_call_table:
        .quad sys_epoll_wait
        .quad sys_remap_file_pages
        .quad sys_set_tid_address
-        .quad sys32_timer_create
+        .quad compat_sys_timer_create
        .quad compat_sys_timer_settime  /* 260 */
        .quad compat_sys_timer_gettime
        .quad sys_timer_getoverrun
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 5389df610e78..54481af5344a 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -969,25 +969,6 @@ long sys32_kill(int pid, int sig)
        return sys_kill(pid, sig);
 }
 
-extern asmlinkage long
-sys_timer_create(clockid_t which_clock,
-                 struct sigevent __user *timer_event_spec,
-                 timer_t __user * created_timer_id);
-long
-sys32_timer_create(u32 clock, struct compat_sigevent __user *se32, timer_t __user *timer_id)
-{
-        struct sigevent __user *p = NULL;
-        if (se32) { 
-                struct sigevent se;
-                p = compat_alloc_user_space(sizeof(struct sigevent));
-                if (get_compat_sigevent(&se, se32) ||
-                    copy_to_user(p, &se, sizeof(se)))
-                        return -EFAULT;
-        } 
-        return sys_timer_create(clock, p, timer_id);
-} 
 long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high, 
                        __u32 len_low, __u32 len_high, int advice)
 { 
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index fe4cbd1c4b2f..12bc54005e2f 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o  nmi.o
 obj-$(CONFIG_X86_IO_APIC)       += io_apic.o mpparse.o \
                genapic.o genapic_cluster.o genapic_flat.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o crash.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_PM)                += suspend.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)  += suspend_asm.o
 obj-$(CONFIG_CPU_FREQ)          += cpufreq/
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index 535e04466079..4e6c3b729e39 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -11,19 +11,156 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
+#include <linux/irq.h>
 #include <linux/reboot.h>
 #include <linux/kexec.h>
+#include <linux/delay.h>
+#include <linux/elf.h>
+#include <linux/elfcore.h>
 #include <asm/processor.h>
 #include <asm/hardirq.h>
 #include <asm/nmi.h>
 #include <asm/hw_irq.h>
+#include <asm/mach_apic.h>
-note_buf_t crash_notes[NR_CPUS];
+/* This keeps a track of which one is crashing cpu. */
+static int crashing_cpu;
+static u32 *append_elf_note(u32 *buf, char *name, unsigned type,
+                                                void *data, size_t data_len)
+{
+        struct elf_note note;
+        note.n_namesz = strlen(name) + 1;
+        note.n_descsz = data_len;
+        note.n_type   = type;
+        memcpy(buf, &note, sizeof(note));
+        buf += (sizeof(note) +3)/4;
+        memcpy(buf, name, note.n_namesz);
+        buf += (note.n_namesz + 3)/4;
+        memcpy(buf, data, note.n_descsz);
+        buf += (note.n_descsz + 3)/4;
+        return buf;
+}
+static void final_note(u32 *buf)
+{
+        struct elf_note note;
+        note.n_namesz = 0;
+        note.n_descsz = 0;
+        note.n_type   = 0;
+        memcpy(buf, &note, sizeof(note));
+}
+static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
+{
+        struct elf_prstatus prstatus;
+        u32 *buf;
+        if ((cpu < 0) || (cpu >= NR_CPUS))
+                return;
+        /* Using ELF notes here is opportunistic.
+         * I need a well defined structure format
+         * for the data I pass, and I need tags
+         * on the data to indicate what information I have
+         * squirrelled away.  ELF notes happen to provide
+         * all of that that no need to invent something new.
+         */
+        buf = (u32*)per_cpu_ptr(crash_notes, cpu);
+        if (!buf)
+                return;
+        memset(&prstatus, 0, sizeof(prstatus));
+        prstatus.pr_pid = current->pid;
+        elf_core_copy_regs(&prstatus.pr_reg, regs);
+        buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
+                                        sizeof(prstatus));
+        final_note(buf);
+}
+static void crash_save_self(struct pt_regs *regs)
+{
+        int cpu;
+        cpu = smp_processor_id();
+        crash_save_this_cpu(regs, cpu);
+}
+#ifdef CONFIG_SMP
+static atomic_t waiting_for_crash_ipi;
+static int crash_nmi_callback(struct pt_regs *regs, int cpu)
+{
+        /*
+         * Don't do anything if this handler is invoked on crashing cpu.
+         * Otherwise, system will completely hang. Crashing cpu can get
+         * an NMI if system was initially booted with nmi_watchdog parameter.
+         */
+        if (cpu == crashing_cpu)
+                return 1;
+        local_irq_disable();
+        crash_save_this_cpu(regs, cpu);
+        disable_local_APIC();
+        atomic_dec(&waiting_for_crash_ipi);
+        /* Assume hlt works */
+        for(;;)
+                asm("hlt");
+        return 1;
+}
+static void smp_send_nmi_allbutself(void)
+{
+        send_IPI_allbutself(APIC_DM_NMI);
+}
+/*
+ * This code is a best effort heuristic to get the
+ * other cpus to stop executing. So races with
+ * cpu hotplug shouldn't matter.
+ */
+static void nmi_shootdown_cpus(void)
+{
+        unsigned long msecs;
+        atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
+        set_nmi_callback(crash_nmi_callback);
+        /*
+         * Ensure the new callback function is set before sending
+         * out the NMI
+         */
+        wmb();
+        smp_send_nmi_allbutself();
+        msecs = 1000; /* Wait at most a second for the other cpus to stop */
+        while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) {
+                mdelay(1);
+                msecs--;
+        }
+        /* Leave the nmi callback set */
+        disable_local_APIC();
+}
+#else
+static void nmi_shootdown_cpus(void)
+{
+        /* There are no cpus to shootdown */
+}
+#endif
 void machine_crash_shutdown(struct pt_regs *regs)
 {
-        /* This function is only called after the system
+        /*
+         * This function is only called after the system
         * has paniced or is otherwise in a critical state.
         * The minimum amount of code to allow a kexec'd kernel
         * to run successfully needs to happen here.
@@ -31,4 +168,19 @@ void machine_crash_shutdown(struct pt_regs *regs)
         * In practice this means shooting down the other cpus in
         * an SMP system.
         */
+        /* The kernel is broken so disable interrupts */
+        local_irq_disable();
+        /* Make a note of crashing cpu. Will be used in NMI callback.*/
+        crashing_cpu = smp_processor_id();
+        nmi_shootdown_cpus();
+        if(cpu_has_apic)
+                 disable_local_APIC();
+#if defined(CONFIG_X86_IO_APIC)
+        disable_IO_APIC();
+#endif
+        crash_save_self(regs);
 }
diff --git a/arch/x86_64/kernel/crash_dump.c b/arch/x86_64/kernel/crash_dump.c
new file mode 100644
index 000000000000..942deac4d43a
--- /dev/null
+++ b/arch/x86_64/kernel/crash_dump.c
@@ -0,0 +1,47 @@
+/*
+ *      kernel/crash_dump.c - Memory preserving reboot related code.
+ *
+ *      Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
+ *      Copyright (C) IBM Corporation, 2004. All rights reserved
+ */
+#include <linux/errno.h>
+#include <linux/crash_dump.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+/**
+ * copy_oldmem_page - copy one page from "oldmem"
+ * @pfn: page frame number to be copied
+ * @buf: target memory address for the copy; this can be in kernel address
+ *      space or user address space (see @userbuf)
+ * @csize: number of bytes to copy
+ * @offset: offset in bytes into the page (based on pfn) to begin the copy
+ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
+ *      otherwise @buf is in kernel address space, use memcpy().
+ *
+ * Copy a page from "oldmem". For this page, there is no pte mapped
+ * in the current kernel. We stitch up a pte, similar to kmap_atomic.
+ */
+ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
+                               size_t csize, unsigned long offset, int userbuf)
+{
+        void  *vaddr;
+        if (!csize)
+                return 0;
+        vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
+        if (userbuf) {
+                if (copy_to_user(buf, (vaddr + offset), csize)) {
+                        iounmap(vaddr);
+                        return -EFAULT;
+                }
+        } else
+        memcpy(buf, (vaddr + offset), csize);
+        iounmap(vaddr);
+        return csize;
+}
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index 17579a1a174b..293cd71a266a 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -559,6 +559,27 @@ void __init parse_memopt(char *p, char **from)
        end_user_pfn >>= PAGE_SHIFT;    
 } 
+void __init parse_memmapopt(char *p, char **from)
+{
+        unsigned long long start_at, mem_size;
+        mem_size = memparse(p, from);
+        p = *from;
+        if (*p == '@') {
+                start_at = memparse(p+1, from);
+                add_memory_region(start_at, mem_size, E820_RAM);
+        } else if (*p == '#') {
+                start_at = memparse(p+1, from);
+                add_memory_region(start_at, mem_size, E820_ACPI);
+        } else if (*p == '$') {
+                start_at = memparse(p+1, from);
+                add_memory_region(start_at, mem_size, E820_RESERVED);
+        } else {
+                end_user_pfn = (mem_size >> PAGE_SHIFT);
+        }
+        p = *from;
+}
 unsigned long pci_mem_start = 0xaeedbabe;
 /*
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index afe11f4fbd1d..b7dc1f816d13 100644
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -42,8 +42,8 @@
 #include <asm/pgtable.h>
 #include <asm/kdebug.h>
-static DECLARE_MUTEX(kprobe_mutex);
 void jprobe_return_end(void);
+static void __kprobes arch_copy_kprobe(struct kprobe *p);
 DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
 DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
@@ -69,12 +69,11 @@ static inline int is_IF_modifier(kprobe_opcode_t *insn)
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
        /* insn: must be on special executable page on x86_64. */
-        down(&kprobe_mutex);
        p->ainsn.insn = get_insn_slot();
-        up(&kprobe_mutex);
        if (!p->ainsn.insn) {
                return -ENOMEM;
        }
+        arch_copy_kprobe(p);
        return 0;
 }
@@ -181,7 +180,7 @@ static inline s32 *is_riprel(u8 *insn)
        return NULL;
 }
-void __kprobes arch_copy_kprobe(struct kprobe *p)
+static void __kprobes arch_copy_kprobe(struct kprobe *p)
 {
        s32 *ripdisp;
        memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE);
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 64c4534b930c..a0e0c9ca8f10 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -35,6 +35,7 @@
 #include <asm/processor.h>
 #include <linux/console.h>
 #include <linux/seq_file.h>
+#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
@@ -275,6 +276,7 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 {
        char c = ' ', *to = command_line, *from = COMMAND_LINE;
        int len = 0;
+        int userdef = 0;
        /* Save unparsed command line copy for /proc/cmdline */
        memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
@@ -357,6 +359,28 @@ static __init void parse_cmdline_early (char ** cmdline_p)
                if (!memcmp(from, "mem=", 4))
                        parse_memopt(from+4, &from); 
+                if (!memcmp(from, "memmap=", 7)) {
+                        /* exactmap option is for used defined memory */
+                        if (!memcmp(from+7, "exactmap", 8)) {
+#ifdef CONFIG_CRASH_DUMP
+                                /* If we are doing a crash dump, we
+                                 * still need to know the real mem
+                                 * size before original memory map is
+                                 * reset.
+                                 */
+                                saved_max_pfn = e820_end_of_ram();
+#endif
+                                from += 8+7;
+                                end_pfn_map = 0;
+                                e820.nr_map = 0;
+                                userdef = 1;
+                        }
+                        else {
+                                parse_memmapopt(from+7, &from);
+                                userdef = 1;
+                        }
+                }
 #ifdef CONFIG_NUMA
                if (!memcmp(from, "numa=", 5))
                        numa_setup(from+5); 
@@ -395,6 +419,14 @@ static __init void parse_cmdline_early (char ** cmdline_p)
                }
 #endif
+#ifdef CONFIG_PROC_VMCORE
+                /* elfcorehdr= specifies the location of elf core header
+                 * stored by the crashed kernel. This option will be passed
+                 * by kexec loader to the capture kernel.
+                 */
+                else if(!memcmp(from, "elfcorehdr=", 11))
+                        elfcorehdr_addr = memparse(from+11, &from);
+#endif
        next_char:
                c = *(from++);
                if (!c)
@@ -403,6 +435,10 @@ static __init void parse_cmdline_early (char ** cmdline_p)
                        break;
                *(to++) = c;
        }
+        if (userdef) {
+                printk(KERN_INFO "user-defined physical RAM map:\n");
+                e820_print_map("user");
+        }
        *to = '\0';
        *cmdline_p = command_line;
 }
diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c
index 4a54221e10bc..b7fd6681c629 100644
--- a/arch/x86_64/kernel/x8664_ksyms.c
+++ b/arch/x86_64/kernel/x8664_ksyms.c
@@ -13,7 +13,6 @@
 #include <linux/string.h>
 #include <linux/syscalls.h>
 #include <linux/tty.h>
-#include <linux/ioctl32.h>
 #include <asm/semaphore.h>
 #include <asm/processor.h>
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7e841aa2a4aa..7ee4a14ec3b1 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -18,10 +18,6 @@ config XTENSA
          with reasonable minimum requirements.  The Xtensa Linux project has
          a home page at <http://xtensa.sourceforge.net/>.
-config UID16
-        bool
-        default n
 config RWSEM_XCHGADD_ALGORITHM
        bool
        default y