Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

1 files changed, 4 insertions, 10 deletions

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index fa3f1a354b3f..a15e18a00258 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -35,6 +35,7 @@
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
 #include <linux/eisa.h>
+#include <linux/pfn.h>
 #ifdef CONFIG_MAGIC_SYSRQ
 #include <linux/sysrq.h>
 #include <linux/reboot.h>
@@ -43,7 +44,7 @@
 #include <asm/setup.h>
 #include <asm/io.h>
 
-extern struct notifier_block *panic_notifier_list;
+extern struct atomic_notifier_head panic_notifier_list;
 static int alpha_panic_event(struct notifier_block *, unsigned long, void *);
 static struct notifier_block alpha_panic_block = {
         alpha_panic_event,
@@ -242,9 +243,6 @@ reserve_std_resources(void)
                 request_resource(io, standard_io_resources+i);
 }
 
-#define PFN_UP(x)       (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-#define PFN_DOWN(x)     ((x) >> PAGE_SHIFT)
-#define PFN_PHYS(x)     ((x) << PAGE_SHIFT)
 #define PFN_MAX         PFN_DOWN(0x80000000)
 #define for_each_mem_cluster(memdesc, cluster, i)               \
         for ((cluster) = (memdesc)->cluster, (i) = 0;           \
@@ -473,11 +471,6 @@ page_is_ram(unsigned long pfn)
         return 0;
 }
 
-#undef PFN_UP
-#undef PFN_DOWN
-#undef PFN_PHYS
-#undef PFN_MAX
-
 void __init
 setup_arch(char **cmdline_p)
 {
@@ -508,7 +501,8 @@ setup_arch(char **cmdline_p)
         }
 
         /* Register a call for panic conditions. */
-        notifier_chain_register(&panic_notifier_list, &alpha_panic_block);
+        atomic_notifier_chain_register(&panic_notifier_list,
+                        &alpha_panic_block);
 
 #ifdef CONFIG_ALPHA_GENERIC
         /* Assume that we've booted from SRM if we haven't booted from MILO.