69 files changed, 1159 insertions, 387 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index cdd5b934f43e..e07c432c731f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -398,9 +398,6 @@ and is between 256 and 4096 characters. It is defined in the file
         cio_ignore=     [S390]
                         See Documentation/s390/CommonIO for details.
 
-        cio_msg=        [S390]
-                        See Documentation/s390/CommonIO for details.
-
         clock=          [BUGS=X86-32, HW] gettimeofday clocksource override.
                         [Deprecated]
                         Forces specified clocksource (if available) to be used
@@ -689,6 +686,12 @@ and is between 256 and 4096 characters. It is defined in the file
         floppy=         [HW]
                         See Documentation/floppy.txt.
 
+        force_pal_cache_flush
+                        [IA-64] Avoid check_sal_cache_flush which may hang on
+                        buggy SAL_CACHE_FLUSH implementations. Using this
+                        parameter will force ia64_sal_cache_flush to call
+                        ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.
+
         gamecon.map[2|3]=
                         [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                         support via parallel port (up to 5 devices per port)
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 0df5f6f75edf..16be41446b5b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -135,6 +135,7 @@ config IA64_GENERIC
           HP-zx1/sx1000         For HP systems
           HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices.
           SGI-SN2               For SGI Altix systems
+          SGI-UV                For SGI UV systems
           Ski-simulator         For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
 
           If you don't know what to do, choose "generic".
@@ -170,6 +171,18 @@ config IA64_SGI_SN2
           to select this option.  If in doubt, select ia64 generic support
           instead.
 
+config IA64_SGI_UV`
+        bool "SGI-UV`"
+        select NUMA
+        select ACPI_NUMA
+        select SWIOTLB
+        help
+          Selecting this option will optimize the kernel for use on UV based
+          systems, but the resulting kernel binary will not run on other
+          types of ia64 systems.  If you have an SGI UV system, it's safe
+          to select this option.  If in doubt, select ia64 generic support
+          instead.
+
 config IA64_HP_SIM
         bool "Ski-simulator"
         select SWIOTLB
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index ec4cca477f49..88f1a55c6c94 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -63,7 +63,7 @@ drivers-$(CONFIG_PCI)		+= arch/ia64/pci/
 drivers-$(CONFIG_IA64_HP_SIM)   += arch/ia64/hp/sim/
 drivers-$(CONFIG_IA64_HP_ZX1)   += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
-drivers-$(CONFIG_IA64_GENERIC)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/
+drivers-$(CONFIG_IA64_GENERIC)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/ arch/ia64/uv/
 drivers-$(CONFIG_OPROFILE)      += arch/ia64/oprofile/
 
 boot := arch/ia64/hp/sim/boot
diff --git a/arch/ia64/ia32/ia32_support.c b/arch/ia64/ia32/ia32_support.c
index 896b1ebbfb26..a6965ddafc46 100644
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
@@ -15,7 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/personality.h>
 #include <linux/sched.h>
 
 #include <asm/intrinsics.h>
@@ -29,7 +28,6 @@
 
 extern int die_if_kernel (char *str, struct pt_regs *regs, long err);
 
-struct exec_domain ia32_exec_domain;
 struct page *ia32_shared_page[NR_CPUS];
 unsigned long *ia32_boot_gdt;
 unsigned long *cpu_gdt_table[NR_CPUS];
@@ -240,14 +238,6 @@ ia32_cpu_init (void)
 static int __init
 ia32_init (void)
 {
-        ia32_exec_domain.name = "Linux/x86";
-        ia32_exec_domain.handler = NULL;
-        ia32_exec_domain.pers_low = PER_LINUX32;
-        ia32_exec_domain.pers_high = PER_LINUX32;
-        ia32_exec_domain.signal_map = default_exec_domain.signal_map;
-        ia32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;
-        register_exec_domain(&ia32_exec_domain);
-
 #if PAGE_SHIFT > IA32_PAGE_SHIFT
         {
                 extern struct kmem_cache *ia64_partial_page_cachep;
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 19709a079635..853d1f11be00 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -117,7 +117,10 @@ acpi_get_sysname(void)
         if (!strcmp(hdr->oem_id, "HP")) {
                 return "hpzx1";
         } else if (!strcmp(hdr->oem_id, "SGI")) {
-                return "sn2";
+                if (!strcmp(hdr->oem_table_id + 4, "UV"))
+                        return "uv";
+                else
+                        return "sn2";
         }
 
         return "dig";
@@ -130,6 +133,8 @@ acpi_get_sysname(void)
         return "hpzx1_swiotlb";
 # elif defined (CONFIG_IA64_SGI_SN2)
         return "sn2";
+# elif defined (CONFIG_IA64_SGI_UV)
+        return "uv";
 # elif defined (CONFIG_IA64_DIG)
         return "dig";
 # else
@@ -622,6 +627,9 @@ void acpi_unregister_gsi(u32 gsi)
         if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
                 return;
 
+        if (has_8259 && gsi < 16)
+                return;
+
         iosapic_unregister_intr(gsi);
 }
 
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index e49ad8c5dc69..ca2bb95726de 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1156,6 +1156,9 @@ skip_rbs_switch:
          *      r31 = current->thread_info->flags
          * On exit:
          *      p6 = TRUE if work-pending-check needs to be redone
+         *
+         * Interrupts are disabled on entry, reenabled depend on work, and
+         * disabled on exit.
          */
 .work_pending_syscall:
         add r2=-8,r2
@@ -1164,16 +1167,16 @@ skip_rbs_switch:
         st8 [r2]=r8
         st8 [r3]=r10
 .work_pending:
-        tbit.z p6,p0=r31,TIF_NEED_RESCHED               // current_thread_info()->need_resched==0?
+        tbit.z p6,p0=r31,TIF_NEED_RESCHED       // is resched not needed?
 (p6)    br.cond.sptk.few .notify
 #ifdef CONFIG_PREEMPT
 (pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1
         ;;
 (pKStk) st4 [r20]=r21
-        ssm psr.i               // enable interrupts
 #endif
+        ssm psr.i               // enable interrupts
         br.call.spnt.many rp=schedule
-.ret9:  cmp.eq p6,p0=r0,r0                              // p6 <- 1
+.ret9:  cmp.eq p6,p0=r0,r0      // p6 <- 1 (re-check)
         rsm psr.i               // disable interrupts
         ;;
 #ifdef CONFIG_PREEMPT
@@ -1182,13 +1185,13 @@ skip_rbs_switch:
 (pKStk) st4 [r20]=r0            // preempt_count() <- 0
 #endif
 (pLvSys)br.cond.sptk.few  .work_pending_syscall_end
-        br.cond.sptk.many .work_processed_kernel        // re-check
+        br.cond.sptk.many .work_processed_kernel
 
 .notify:
 (pUStk) br.call.spnt.many rp=notify_resume_user
-.ret10: cmp.ne p6,p0=r0,r0                              // p6 <- 0
+.ret10: cmp.ne p6,p0=r0,r0      // p6 <- 0 (don't re-check)
 (pLvSys)br.cond.sptk.few  .work_pending_syscall_end
-        br.cond.sptk.many .work_processed_kernel        // don't re-check
+        br.cond.sptk.many .work_processed_kernel
 
 .work_pending_syscall_end:
         adds r2=PT(R8)+16,r12
@@ -1196,7 +1199,7 @@ skip_rbs_switch:
         ;;
         ld8 r8=[r2]
         ld8 r10=[r3]
-        br.cond.sptk.many .work_processed_syscall       // re-check
+        br.cond.sptk.many .work_processed_syscall
 
 END(ia64_leave_kernel)
 
@@ -1234,9 +1237,12 @@ GLOBAL_ENTRY(ia64_invoke_schedule_tail)
 END(ia64_invoke_schedule_tail)
 
         /*
-         * Setup stack and call do_notify_resume_user().  Note that pSys and pNonSys need to
-         * be set up by the caller.  We declare 8 input registers so the system call
-         * args get preserved, in case we need to restart a system call.
+         * Setup stack and call do_notify_resume_user(), keeping interrupts
+         * disabled.
+         *
+         * Note that pSys and pNonSys need to be set up by the caller.
+         * We declare 8 input registers so the system call args get preserved,
+         * in case we need to restart a system call.
          */
 ENTRY(notify_resume_user)
         .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 4547a2092af9..9dc00f7fe10e 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -900,12 +900,6 @@ static void
 palinfo_smp_call(void *info)
 {
         palinfo_smp_data_t *data = (palinfo_smp_data_t *)info;
-        if (data == NULL) {
-                printk(KERN_ERR "palinfo: data pointer is NULL\n");
-                data->ret = 0; /* no output */
-                return;
-        }
-        /* does this actual call */
         data->ret = (*data->func)(data->page);
 }
 
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index c1ad27de2dd2..71d05133f556 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -5013,12 +5013,13 @@ pfm_context_force_terminate(pfm_context_t *ctx, struct pt_regs *regs)
 }
 
 static int pfm_ovfl_notify_user(pfm_context_t *ctx, unsigned long ovfl_pmds);
+
  /*
   * pfm_handle_work() can be called with interrupts enabled
   * (TIF_NEED_RESCHED) or disabled. The down_interruptible
   * call may sleep, therefore we must re-enable interrupts
   * to avoid deadlocks. It is safe to do so because this function
-  * is called ONLY when returning to user level (PUStk=1), in which case
+  * is called ONLY when returning to user level (pUStk=1), in which case
   * there is no risk of kernel stack overflow due to deep
   * interrupt nesting.
   */
@@ -5034,7 +5035,8 @@ pfm_handle_work(void)
 
         ctx = PFM_GET_CTX(current);
         if (ctx == NULL) {
-                printk(KERN_ERR "perfmon: [%d] has no PFM context\n", task_pid_nr(current));
+                printk(KERN_ERR "perfmon: [%d] has no PFM context\n",
+                        task_pid_nr(current));
                 return;
         }
 
@@ -5058,11 +5060,12 @@ pfm_handle_work(void)
         /*
          * must be done before we check for simple-reset mode
          */
-        if (ctx->ctx_fl_going_zombie || ctx->ctx_state == PFM_CTX_ZOMBIE) goto do_zombie;
-
+        if (ctx->ctx_fl_going_zombie || ctx->ctx_state == PFM_CTX_ZOMBIE)
+                goto do_zombie;
 
         //if (CTX_OVFL_NOBLOCK(ctx)) goto skip_blocking;
-        if (reason == PFM_TRAP_REASON_RESET) goto skip_blocking;
+        if (reason == PFM_TRAP_REASON_RESET)
+                goto skip_blocking;
 
         /*
          * restore interrupt mask to what it was on entry.
@@ -5110,7 +5113,8 @@ do_zombie:
         /*
          * in case of interruption of down() we don't restart anything
          */
-        if (ret < 0) goto nothing_to_do;
+        if (ret < 0)
+                goto nothing_to_do;
 
 skip_blocking:
         pfm_resume_after_ovfl(ctx, ovfl_regs, regs);
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 58dcfac5ea88..a3a34b4eb038 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -167,11 +167,18 @@ void tsk_clear_notify_resume(struct task_struct *tsk)
         clear_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME);
 }
 
+/*
+ * do_notify_resume_user():
+ *      Called from notify_resume_user at entry.S, with interrupts disabled.
+ */
 void
-do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall)
+do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
 {
         if (fsys_mode(current, &scr->pt)) {
-                /* defer signal-handling etc. until we return to privilege-level 0.  */
+                /*
+                 * defer signal-handling etc. until we return to
+                 * privilege-level 0.
+                 */
                 if (!ia64_psr(&scr->pt)->lp)
                         ia64_psr(&scr->pt)->lp = 1;
                 return;
@@ -179,16 +186,26 @@ do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall
 
 #ifdef CONFIG_PERFMON
         if (current->thread.pfm_needs_checking)
+                /*
+                 * Note: pfm_handle_work() allow us to call it with interrupts
+                 * disabled, and may enable interrupts within the function.
+                 */
                 pfm_handle_work();
 #endif
 
         /* deal with pending signal delivery */
-        if (test_thread_flag(TIF_SIGPENDING))
+        if (test_thread_flag(TIF_SIGPENDING)) {
+                local_irq_enable();     /* force interrupt enable */
                 ia64_do_signal(scr, in_syscall);
+        }
 
         /* copy user rbs to kernel rbs */
-        if (unlikely(test_thread_flag(TIF_RESTORE_RSE)))
+        if (unlikely(test_thread_flag(TIF_RESTORE_RSE))) {
+                local_irq_enable();     /* force interrupt enable */
                 ia64_sync_krbs();
+        }
+
+        local_irq_disable();    /* force interrupt disable */
 }
 
 static int pal_halt        = 1;
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c
index a3022dc48ef8..7e0259709c04 100644
--- a/arch/ia64/kernel/sal.c
+++ b/arch/ia64/kernel/sal.c
@@ -229,6 +229,14 @@ static void __init sal_desc_ap_wakeup(void *p) { }
  */
 static int sal_cache_flush_drops_interrupts;
 
+static int __init
+force_pal_cache_flush(char *str)
+{
+        sal_cache_flush_drops_interrupts = 1;
+        return 0;
+}
+early_param("force_pal_cache_flush", force_pal_cache_flush);
+
 void __init
 check_sal_cache_flush (void)
 {
@@ -237,6 +245,9 @@ check_sal_cache_flush (void)
         u64 vector, cache_type = 3;
         struct ia64_sal_retval isrv;
 
+        if (sal_cache_flush_drops_interrupts)
+                return;
+
         cpu = get_cpu();
         local_irq_save(flags);
 
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5015ca1275ca..e9596cd0cdab 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -239,6 +239,25 @@ __initcall(register_memory);
 
 
 #ifdef CONFIG_KEXEC
+
+/*
+ * This function checks if the reserved crashkernel is allowed on the specific
+ * IA64 machine flavour. Machines without an IO TLB use swiotlb and require
+ * some memory below 4 GB (i.e. in 32 bit area), see the implementation of
+ * lib/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that
+ * in kdump case. See the comment in sba_init() in sba_iommu.c.
+ *
+ * So, the only machvec that really supports loading the kdump kernel
+ * over 4 GB is "sn2".
+ */
+static int __init check_crashkernel_memory(unsigned long pbase, size_t size)
+{
+        if (ia64_platform_is("sn2") || ia64_platform_is("uv"))
+                return 1;
+        else
+                return pbase < (1UL << 32);
+}
+
 static void __init setup_crashkernel(unsigned long total, int *n)
 {
         unsigned long long base = 0, size = 0;
@@ -252,6 +271,16 @@ static void __init setup_crashkernel(unsigned long total, int *n)
                         base = kdump_find_rsvd_region(size,
                                         rsvd_region, *n);
                 }
+
+                if (!check_crashkernel_memory(base, size)) {
+                        pr_warning("crashkernel: There would be kdump memory "
+                                "at %ld GB but this is unusable because it "
+                                "must\nbe below 4 GB. Change the memory "
+                                "configuration of the machine.\n",
+                                (unsigned long)(base >> 30));
+                        return;
+                }
+
                 if (base != ~0UL) {
                         printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
                                         "for crashkernel (System RAM: %ldMB)\n",
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index fc6c6636ffda..200100ea7610 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -719,3 +719,28 @@ out:
 EXPORT_SYMBOL_GPL(remove_memory);
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 #endif
+
+/*
+ * Even when CONFIG_IA32_SUPPORT is not enabled it is
+ * useful to have the Linux/x86 domain registered to
+ * avoid an attempted module load when emulators call
+ * personality(PER_LINUX32). This saves several milliseconds
+ * on each such call.
+ */
+static struct exec_domain ia32_exec_domain;
+
+static int __init
+per_linux32_init(void)
+{
+        ia32_exec_domain.name = "Linux/x86";
+        ia32_exec_domain.handler = NULL;
+        ia32_exec_domain.pers_low = PER_LINUX32;
+        ia32_exec_domain.pers_high = PER_LINUX32;
+        ia32_exec_domain.signal_map = default_exec_domain.signal_map;
+        ia32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;
+        register_exec_domain(&ia32_exec_domain);
+
+        return 0;
+}
+
+__initcall(per_linux32_init);
diff --git a/arch/ia64/uv/Makefile b/arch/ia64/uv/Makefile
new file mode 100644
index 000000000000..aa9f91947c49
--- /dev/null
+++ b/arch/ia64/uv/Makefile
@@ -0,0 +1,12 @@
+# arch/ia64/uv/Makefile
+#
+# 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) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+#
+# Makefile for the sn uv subplatform
+#
+
+obj-y += kernel/
diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile
new file mode 100644
index 000000000000..8d92b4684d8e
--- /dev/null
+++ b/arch/ia64/uv/kernel/Makefile
@@ -0,0 +1,13 @@
+# arch/ia64/uv/kernel/Makefile
+#
+# 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) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+EXTRA_CFLAGS += -Iarch/ia64/sn/include
+
+obj-y                           += setup.o
+obj-$(CONFIG_IA64_GENERIC)      += machvec.o
diff --git a/arch/ia64/uv/kernel/machvec.c b/arch/ia64/uv/kernel/machvec.c
new file mode 100644
index 000000000000..50737a9dca74
--- /dev/null
+++ b/arch/ia64/uv/kernel/machvec.c
@@ -0,0 +1,11 @@
+/*
+ * 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) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ */
+
+#define MACHVEC_PLATFORM_NAME   uv
+#define MACHVEC_PLATFORM_HEADER <asm/machvec_uv.h>
+#include <asm/machvec_init.h>
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c
new file mode 100644
index 000000000000..9aa743203c3c
--- /dev/null
+++ b/arch/ia64/uv/kernel/setup.c
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ *
+ * SGI UV Core Functions
+ *
+ * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
+ */
+
+#include <linux/module.h>
+#include <linux/percpu.h>
+#include <asm/sn/simulator.h>
+#include <asm/uv/uv_mmrs.h>
+#include <asm/uv/uv_hub.h>
+
+DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
+EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);
+
+
+struct redir_addr {
+        unsigned long redirect;
+        unsigned long alias;
+};
+
+#define DEST_SHIFT UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT
+
+static __initdata struct redir_addr redir_addrs[] = {
+        {UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR, UVH_SI_ALIAS0_OVERLAY_CONFIG},
+        {UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR, UVH_SI_ALIAS1_OVERLAY_CONFIG},
+        {UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR, UVH_SI_ALIAS2_OVERLAY_CONFIG},
+};
+
+static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
+{
+        union uvh_si_alias0_overlay_config_u alias;
+        union uvh_rh_gam_alias210_redirect_config_2_mmr_u redirect;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(redir_addrs); i++) {
+                alias.v = uv_read_local_mmr(redir_addrs[i].alias);
+                if (alias.s.base == 0) {
+                        *size = (1UL << alias.s.m_alias);
+                        redirect.v = uv_read_local_mmr(redir_addrs[i].redirect);
+                        *base = (unsigned long)redirect.s.dest_base << DEST_SHIFT;
+                        return;
+                }
+        }
+        BUG();
+}
+
+void __init uv_setup(char **cmdline_p)
+{
+        union uvh_si_addr_map_config_u m_n_config;
+        union uvh_node_id_u node_id;
+        unsigned long gnode_upper;
+        int nid, cpu, m_val, n_val;
+        unsigned long mmr_base, lowmem_redir_base, lowmem_redir_size;
+
+        if (IS_MEDUSA()) {
+                lowmem_redir_base = 0;
+                lowmem_redir_size = 0;
+                node_id.v = 0;
+                m_n_config.s.m_skt = 37;
+                m_n_config.s.n_skt = 0;
+                mmr_base = 0;
+        } else {
+                get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size);
+                node_id.v = uv_read_local_mmr(UVH_NODE_ID);
+                m_n_config.v = uv_read_local_mmr(UVH_SI_ADDR_MAP_CONFIG);
+                mmr_base =
+                        uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) &
+                                ~UV_MMR_ENABLE;
+        }
+
+        m_val = m_n_config.s.m_skt;
+        n_val = m_n_config.s.n_skt;
+        printk(KERN_DEBUG "UV: global MMR base 0x%lx\n", mmr_base);
+
+        gnode_upper = (((unsigned long)node_id.s.node_id) &
+                       ~((1 << n_val) - 1)) << m_val;
+
+        for_each_present_cpu(cpu) {
+                nid = cpu_to_node(cpu);
+                uv_cpu_hub_info(cpu)->lowmem_remap_base = lowmem_redir_base;
+                uv_cpu_hub_info(cpu)->lowmem_remap_top =
+                        lowmem_redir_base + lowmem_redir_size;
+                uv_cpu_hub_info(cpu)->m_val = m_val;
+                uv_cpu_hub_info(cpu)->n_val = m_val;
+                uv_cpu_hub_info(cpu)->pnode_mask = (1 << n_val) -1;
+                uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;
+                uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;
+                uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;
+                uv_cpu_hub_info(cpu)->coherency_domain_number = 0;/* ZZZ */
+                printk(KERN_DEBUG "UV cpu %d, nid %d\n", cpu, nid);
+        }
+}
+
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S
index 38a1c1b8d4e8..f0b18ce89842 100644
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
@@ -13,9 +13,10 @@
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 
         .level  LEVEL
-        .text
+        __HEAD
 
         .import hpux_call_table
         .import hpux_syscall_exit,code
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S
index 58c53c879c02..ccd3a50c0995 100644
--- a/arch/parisc/hpux/wrappers.S
+++ b/arch/parisc/hpux/wrappers.S
@@ -28,9 +28,10 @@
 #include <asm/assembly.h>
 #include <asm/signal.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 
         .level  LEVEL
-        .text
+        __HEAD
 
         /* These should probably go in a header file somewhere.
          * They are duplicated in kernel/wrappers.S
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 1f6585a56f97..016d3fc4111c 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -4,9 +4,6 @@
 
 extra-y                 := init_task.o head.o vmlinux.lds
 
-AFLAGS_entry.o  := -traditional
-AFLAGS_pacache.o := -traditional
-
 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 \
                    ptrace.o hardware.o inventory.o drivers.o \
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 111d47284eac..5d0837458c19 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -38,18 +38,11 @@
 #include <asm/thread_info.h>
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 
 #ifdef CONFIG_64BIT
-#define CMPIB           cmpib,*
-#define CMPB            cmpb,*
-#define COND(x)         *x
-
         .level 2.0w
 #else
-#define CMPIB           cmpib,
-#define CMPB            cmpb,
-#define COND(x)         x
-
         .level 2.0
 #endif
 
@@ -629,7 +622,7 @@
          * the static part of the kernel address space.
          */
 
-        .text
+        __HEAD
 
         .align  PAGE_SIZE
 
@@ -957,9 +950,9 @@ intr_check_sig:
          * Only do signals if we are returning to user space
          */
         LDREG   PT_IASQ0(%r16), %r20
-        CMPIB=,n 0,%r20,intr_restore /* backward */
+        cmpib,COND(=),n 0,%r20,intr_restore /* backward */
         LDREG   PT_IASQ1(%r16), %r20
-        CMPIB=,n 0,%r20,intr_restore /* backward */
+        cmpib,COND(=),n 0,%r20,intr_restore /* backward */
 
         copy    %r0, %r25                       /* long in_syscall = 0 */
 #ifdef CONFIG_64BIT
@@ -1013,10 +1006,10 @@ intr_do_resched:
          * we jump back to intr_restore.
          */
         LDREG   PT_IASQ0(%r16), %r20
-        CMPIB=  0, %r20, intr_do_preempt
+        cmpib,COND(=)   0, %r20, intr_do_preempt
         nop
         LDREG   PT_IASQ1(%r16), %r20
-        CMPIB=  0, %r20, intr_do_preempt
+        cmpib,COND(=)   0, %r20, intr_do_preempt
         nop
 
 #ifdef CONFIG_64BIT
@@ -1045,7 +1038,7 @@ intr_do_preempt:
         /* current_thread_info()->preempt_count */
         mfctl   %cr30, %r1
         LDREG   TI_PRE_COUNT(%r1), %r19
-        CMPIB<> 0, %r19, intr_restore   /* if preempt_count > 0 */
+        cmpib,COND(<>)  0, %r19, intr_restore   /* if preempt_count > 0 */
         nop                             /* prev insn branched backwards */
 
         /* check if we interrupted a critical path */
@@ -1064,7 +1057,7 @@ intr_do_preempt:
          */
 
 intr_extint:
-        CMPIB=,n 0,%r16,1f
+        cmpib,COND(=),n 0,%r16,1f
 
         get_stack_use_cr30
         b,n 2f
@@ -1099,7 +1092,7 @@ ENDPROC(syscall_exit_rfi)
 
 ENTRY(intr_save)                /* for os_hpmc */
         mfsp    %sr7,%r16
-        CMPIB=,n 0,%r16,1f
+        cmpib,COND(=),n 0,%r16,1f
         get_stack_use_cr30
         b       2f
         copy    %r8,%r26
@@ -1121,7 +1114,7 @@ ENTRY(intr_save)		/* for os_hpmc */
          *           adjust isr/ior below.
          */
 
-        CMPIB=,n        6,%r26,skip_save_ior
+        cmpib,COND(=),n        6,%r26,skip_save_ior
 
 
         mfctl           %cr20, %r16 /* isr */
@@ -1450,11 +1443,11 @@ nadtlb_emulate:
         bb,>=,n         %r9,26,nadtlb_nullify  /* m bit not set, just nullify */
         BL              get_register,%r25
         extrw,u         %r9,15,5,%r8           /* Get index register # */
-        CMPIB=,n        -1,%r1,nadtlb_fault    /* have to use slow path */
+        cmpib,COND(=),n        -1,%r1,nadtlb_fault    /* have to use slow path */
         copy            %r1,%r24
         BL              get_register,%r25
         extrw,u         %r9,10,5,%r8           /* Get base register # */
-        CMPIB=,n        -1,%r1,nadtlb_fault    /* have to use slow path */
+        cmpib,COND(=),n        -1,%r1,nadtlb_fault    /* have to use slow path */
         BL              set_register,%r25
         add,l           %r1,%r24,%r1           /* doesn't affect c/b bits */
 
@@ -1486,7 +1479,7 @@ nadtlb_probe_check:
         cmpb,<>,n       %r16,%r17,nadtlb_fault /* Must be probe,[rw]*/
         BL              get_register,%r25      /* Find the target register */
         extrw,u         %r9,31,5,%r8           /* Get target register */
-        CMPIB=,n        -1,%r1,nadtlb_fault    /* have to use slow path */
+        cmpib,COND(=),n        -1,%r1,nadtlb_fault    /* have to use slow path */
         BL              set_register,%r25
         copy            %r0,%r1                /* Write zero to target register */
         b nadtlb_nullify                       /* Nullify return insn */
@@ -1570,12 +1563,12 @@ dbit_trap_20w:
         L3_ptep         ptp,pte,t0,va,dbit_fault
 
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nolock_20w
+        cmpib,COND(=),n        0,spc,dbit_nolock_20w
         load32          PA(pa_dbit_lock),t0
 
 dbit_spin_20w:
         LDCW            0(t0),t1
-        cmpib,=         0,t1,dbit_spin_20w
+        cmpib,COND(=)         0,t1,dbit_spin_20w
         nop
 
 dbit_nolock_20w:
@@ -1586,7 +1579,7 @@ dbit_nolock_20w:
                 
         idtlbt          pte,prot
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nounlock_20w
+        cmpib,COND(=),n        0,spc,dbit_nounlock_20w
         ldi             1,t1
         stw             t1,0(t0)
 
@@ -1606,7 +1599,7 @@ dbit_trap_11:
         L2_ptep         ptp,pte,t0,va,dbit_fault
 
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nolock_11
+        cmpib,COND(=),n        0,spc,dbit_nolock_11
         load32          PA(pa_dbit_lock),t0
 
 dbit_spin_11:
@@ -1628,7 +1621,7 @@ dbit_nolock_11:
 
         mtsp            t1, %sr1     /* Restore sr1 */
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nounlock_11
+        cmpib,COND(=),n        0,spc,dbit_nounlock_11
         ldi             1,t1
         stw             t1,0(t0)
 
@@ -1646,7 +1639,7 @@ dbit_trap_20:
         L2_ptep         ptp,pte,t0,va,dbit_fault
 
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nolock_20
+        cmpib,COND(=),n        0,spc,dbit_nolock_20
         load32          PA(pa_dbit_lock),t0
 
 dbit_spin_20:
@@ -1665,7 +1658,7 @@ dbit_nolock_20:
         idtlbt          pte,prot
 
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nounlock_20
+        cmpib,COND(=),n        0,spc,dbit_nounlock_20
         ldi             1,t1
         stw             t1,0(t0)
 
@@ -1994,7 +1987,7 @@ ENTRY(syscall_exit)
 
         /* We can't use "CMPIB<> PER_HPUX" since "im5" field is sign extended */
         ldo       -PER_HPUX(%r19), %r19
-        CMPIB<>,n 0,%r19,1f
+        cmpib,COND(<>),n 0,%r19,1f
 
         /* Save other hpux returns if personality is PER_HPUX */
         STREG     %r22,TASK_PT_GR22(%r1)
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index ec2482dc1beb..5680a2c3b13d 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -32,7 +32,7 @@ ENTRY(boot_args)
         .word 0 /* arg3 */
 END(boot_args)
 
-        .section .text.head
+        __HEAD
         .align  4
         .import init_thread_union,data
         .import fault_vector_20,code    /* IVA parisc 2.0 32 bit */
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 2cbf13b3ef11..068322eb8c9b 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -47,6 +47,7 @@
 #include <asm/pdc.h>
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 
         /*
          * stack for os_hpmc, the HPMC handler.
@@ -76,7 +77,7 @@ ENTRY(hpmc_pim_data)
         .block HPMC_PIM_DATA_SIZE
 END(hpmc_pim_data)
 
-        .text
+        __HEAD
 
         .import intr_save, code
 ENTRY(os_hpmc)
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index 4845a6444633..bd1f7f1ff74e 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -499,7 +499,7 @@ add_system_map_addresses(struct parisc_device *dev, int num_addrs,
         dev->addr = kmalloc(num_addrs * sizeof(unsigned long), GFP_KERNEL);
         if(!dev->addr) {
                 printk(KERN_ERR "%s %s(): memory allocation failure\n",
-                       __FILE__, __FUNCTION__);
+                       __FILE__, __func__);
                 return;
         }
 
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 5901092e0196..e3246a5ca74f 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -37,8 +37,9 @@
 #include <asm/pgtable.h>
 #include <asm/cache.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 
-        .text
+        __HEAD
         .align  128
 
 ENTRY(flush_tlb_all_local)
@@ -85,7 +86,7 @@ ENTRY(flush_tlb_all_local)
         LDREG           ITLB_OFF_COUNT(%r1), %arg2
         LDREG           ITLB_LOOP(%r1), %arg3
 
-        ADDIB=          -1, %arg3, fitoneloop   /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fitoneloop   /* Preadjust and test */
         movb,<,n        %arg3, %r31, fitdone    /* If loop < 0, skip */
         copy            %arg0, %r28             /* Init base addr */
 
@@ -95,14 +96,14 @@ fitmanyloop:					/* Loop if LOOP >= 2 */
         copy            %arg2, %r29             /* Init middle loop count */
 
 fitmanymiddle:                                  /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fitmanymiddle /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fitmanymiddle /* Adjusted inner loop decr */
         pitlbe          0(%sr1, %r28)
         pitlbe,m        %arg1(%sr1, %r28)       /* Last pitlbe and addr adjust */
-        ADDIB>          -1, %r29, fitmanymiddle /* Middle loop decr */
+        addib,COND(>)           -1, %r29, fitmanymiddle /* Middle loop decr */
         copy            %arg3, %r31             /* Re-init inner loop count */
 
         movb,tr         %arg0, %r28, fitmanyloop /* Re-init base addr */
-        ADDIB<=,n       -1, %r22, fitdone       /* Outer loop count decr */
+        addib,COND(<=),n        -1, %r22, fitdone       /* Outer loop count decr */
 
 fitoneloop:                                     /* Loop if LOOP = 1 */
         mtsp            %r20, %sr1
@@ -110,10 +111,10 @@ fitoneloop:					/* Loop if LOOP = 1 */
         copy            %arg2, %r29             /* init middle loop count */
 
 fitonemiddle:                                   /* Loop if LOOP = 1 */
-        ADDIB>          -1, %r29, fitonemiddle  /* Middle loop count decr */
+        addib,COND(>)           -1, %r29, fitonemiddle  /* Middle loop count decr */
         pitlbe,m        %arg1(%sr1, %r28)       /* pitlbe for one loop */
 
-        ADDIB>          -1, %r22, fitoneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %r22, fitoneloop    /* Outer loop count decr */
         add             %r21, %r20, %r20                /* increment space */
 
 fitdone:
@@ -128,7 +129,7 @@ fitdone:
         LDREG           DTLB_OFF_COUNT(%r1), %arg2
         LDREG           DTLB_LOOP(%r1), %arg3
 
-        ADDIB=          -1, %arg3, fdtoneloop   /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fdtoneloop   /* Preadjust and test */
         movb,<,n        %arg3, %r31, fdtdone    /* If loop < 0, skip */
         copy            %arg0, %r28             /* Init base addr */
 
@@ -138,14 +139,14 @@ fdtmanyloop:					/* Loop if LOOP >= 2 */
         copy            %arg2, %r29             /* Init middle loop count */
 
 fdtmanymiddle:                                  /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */
         pdtlbe          0(%sr1, %r28)
         pdtlbe,m        %arg1(%sr1, %r28)       /* Last pdtlbe and addr adjust */
-        ADDIB>          -1, %r29, fdtmanymiddle /* Middle loop decr */
+        addib,COND(>)           -1, %r29, fdtmanymiddle /* Middle loop decr */
         copy            %arg3, %r31             /* Re-init inner loop count */
 
         movb,tr         %arg0, %r28, fdtmanyloop /* Re-init base addr */
-        ADDIB<=,n       -1, %r22,fdtdone        /* Outer loop count decr */
+        addib,COND(<=),n        -1, %r22,fdtdone        /* Outer loop count decr */
 
 fdtoneloop:                                     /* Loop if LOOP = 1 */
         mtsp            %r20, %sr1
@@ -153,10 +154,10 @@ fdtoneloop:					/* Loop if LOOP = 1 */
         copy            %arg2, %r29             /* init middle loop count */
 
 fdtonemiddle:                                   /* Loop if LOOP = 1 */
-        ADDIB>          -1, %r29, fdtonemiddle  /* Middle loop count decr */
+        addib,COND(>)           -1, %r29, fdtonemiddle  /* Middle loop count decr */
         pdtlbe,m        %arg1(%sr1, %r28)       /* pdtlbe for one loop */
 
-        ADDIB>          -1, %r22, fdtoneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %r22, fdtoneloop    /* Outer loop count decr */
         add             %r21, %r20, %r20        /* increment space */
 
 
@@ -209,18 +210,18 @@ ENTRY(flush_instruction_cache_local)
         LDREG           ICACHE_COUNT(%r1), %arg2
         LDREG           ICACHE_LOOP(%r1), %arg3
         rsm             PSW_SM_I, %r22          /* No mmgt ops during loop*/
-        ADDIB=          -1, %arg3, fioneloop    /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fioneloop    /* Preadjust and test */
         movb,<,n        %arg3, %r31, fisync     /* If loop < 0, do sync */
 
 fimanyloop:                                     /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fimanyloop    /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fimanyloop    /* Adjusted inner loop decr */
         fice            %r0(%sr1, %arg0)
         fice,m          %arg1(%sr1, %arg0)      /* Last fice and addr adjust */
         movb,tr         %arg3, %r31, fimanyloop /* Re-init inner loop count */
-        ADDIB<=,n       -1, %arg2, fisync       /* Outer loop decr */
+        addib,COND(<=),n        -1, %arg2, fisync       /* Outer loop decr */
 
 fioneloop:                                      /* Loop if LOOP = 1 */
-        ADDIB>          -1, %arg2, fioneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %arg2, fioneloop    /* Outer loop count decr */
         fice,m          %arg1(%sr1, %arg0)      /* Fice for one loop */
 
 fisync:
@@ -250,18 +251,18 @@ ENTRY(flush_data_cache_local)
         LDREG           DCACHE_COUNT(%r1), %arg2
         LDREG           DCACHE_LOOP(%r1), %arg3
         rsm             PSW_SM_I, %r22
-        ADDIB=          -1, %arg3, fdoneloop    /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fdoneloop    /* Preadjust and test */
         movb,<,n        %arg3, %r31, fdsync     /* If loop < 0, do sync */
 
 fdmanyloop:                                     /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fdmanyloop    /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fdmanyloop    /* Adjusted inner loop decr */
         fdce            %r0(%sr1, %arg0)
         fdce,m          %arg1(%sr1, %arg0)      /* Last fdce and addr adjust */
         movb,tr         %arg3, %r31, fdmanyloop /* Re-init inner loop count */
-        ADDIB<=,n       -1, %arg2, fdsync       /* Outer loop decr */
+        addib,COND(<=),n        -1, %arg2, fdsync       /* Outer loop decr */
 
 fdoneloop:                                      /* Loop if LOOP = 1 */
-        ADDIB>          -1, %arg2, fdoneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %arg2, fdoneloop    /* Outer loop count decr */
         fdce,m          %arg1(%sr1, %arg0)      /* Fdce for one loop */
 
 fdsync:
@@ -342,7 +343,7 @@ ENTRY(copy_user_page_asm)
          * non-taken backward branch. Note that .+4 is a backwards branch.
          * The ldd should only get executed if the branch is taken.
          */
-        ADDIB>,n        -1, %r1, 1b             /* bundle 10 */
+        addib,COND(>),n -1, %r1, 1b             /* bundle 10 */
         ldd             0(%r25), %r19           /* start next loads */
 
 #else
@@ -391,7 +392,7 @@ ENTRY(copy_user_page_asm)
         stw             %r21, 56(%r26)
         stw             %r22, 60(%r26)
         ldo             64(%r26), %r26
-        ADDIB>,n        -1, %r1, 1b
+        addib,COND(>),n -1, %r1, 1b
         ldw             0(%r25), %r19
 #endif
         bv              %r0(%r2)
@@ -515,7 +516,7 @@ ENTRY(copy_user_page_asm)
         stw             %r21, 56(%r28)
         stw             %r22, 60(%r28)
         ldo             64(%r28), %r28
-        ADDIB>          -1, %r1,1b
+        addib,COND(>)           -1, %r1,1b
         ldo             64(%r29), %r29
 
         bv              %r0(%r2)
@@ -574,7 +575,7 @@ ENTRY(__clear_user_page_asm)
         std             %r0, 104(%r28)
         std             %r0, 112(%r28)
         std             %r0, 120(%r28)
-        ADDIB>          -1, %r1, 1b
+        addib,COND(>)           -1, %r1, 1b
         ldo             128(%r28), %r28
 
 #else   /* ! CONFIG_64BIT */
@@ -597,7 +598,7 @@ ENTRY(__clear_user_page_asm)
         stw             %r0, 52(%r28)
         stw             %r0, 56(%r28)
         stw             %r0, 60(%r28)
-        ADDIB>          -1, %r1, 1b
+        addib,COND(>)           -1, %r1, 1b
         ldo             64(%r28), %r28
 #endif  /* CONFIG_64BIT */
 
@@ -640,7 +641,7 @@ ENTRY(flush_kernel_dcache_page_asm)
         fdc,m           %r23(%r26)
         fdc,m           %r23(%r26)
         fdc,m           %r23(%r26)
-        CMPB<<          %r26, %r25,1b
+        cmpb,COND(<<)           %r26, %r25,1b
         fdc,m           %r23(%r26)
 
         sync
@@ -683,7 +684,7 @@ ENTRY(flush_user_dcache_page)
         fdc,m           %r23(%sr3, %r26)
         fdc,m           %r23(%sr3, %r26)
         fdc,m           %r23(%sr3, %r26)
-        CMPB<<          %r26, %r25,1b
+        cmpb,COND(<<)           %r26, %r25,1b
         fdc,m           %r23(%sr3, %r26)
 
         sync
@@ -726,7 +727,7 @@ ENTRY(flush_user_icache_page)
         fic,m           %r23(%sr3, %r26)
         fic,m           %r23(%sr3, %r26)
         fic,m           %r23(%sr3, %r26)
-        CMPB<<          %r26, %r25,1b
+        cmpb,COND(<<)           %r26, %r25,1b
         fic,m           %r23(%sr3, %r26)
 
         sync
@@ -769,7 +770,7 @@ ENTRY(purge_kernel_dcache_page)
         pdc,m           %r23(%r26)
         pdc,m           %r23(%r26)
         pdc,m           %r23(%r26)
-        CMPB<<          %r26, %r25, 1b
+        cmpb,COND(<<)           %r26, %r25, 1b
         pdc,m           %r23(%r26)
 
         sync
@@ -833,7 +834,7 @@ ENTRY(flush_alias_page)
         fdc,m           %r23(%r28)
         fdc,m           %r23(%r28)
         fdc,m           %r23(%r28)
-        CMPB<<          %r28, %r29, 1b
+        cmpb,COND(<<)           %r28, %r29, 1b
         fdc,m           %r23(%r28)
 
         sync
@@ -856,7 +857,7 @@ flush_user_dcache_range_asm:
         ldo             -1(%r23), %r21
         ANDCM           %r26, %r21, %r26
 
-1:      CMPB<<,n        %r26, %r25, 1b
+1:      cmpb,COND(<<),n %r26, %r25, 1b
         fdc,m           %r23(%sr3, %r26)
 
         sync
@@ -877,7 +878,7 @@ ENTRY(flush_kernel_dcache_range_asm)
         ldo             -1(%r23), %r21
         ANDCM           %r26, %r21, %r26
 
-1:      CMPB<<,n        %r26, %r25,1b
+1:      cmpb,COND(<<),n %r26, %r25,1b
         fdc,m           %r23(%r26)
 
         sync
@@ -899,7 +900,7 @@ ENTRY(flush_user_icache_range_asm)
         ldo             -1(%r23), %r21
         ANDCM           %r26, %r21, %r26
 
-1:      CMPB<<,n        %r26, %r25,1b
+1:      cmpb,COND(<<),n %r26, %r25,1b
         fic,m           %r23(%sr3, %r26)
 
         sync
@@ -942,7 +943,7 @@ ENTRY(flush_kernel_icache_page)
         fic,m           %r23(%sr4, %r26)
         fic,m           %r23(%sr4, %r26)
         fic,m           %r23(%sr4, %r26)
-        CMPB<<          %r26, %r25, 1b
+        cmpb,COND(<<)           %r26, %r25, 1b
         fic,m           %r23(%sr4, %r26)
 
         sync
@@ -963,7 +964,7 @@ ENTRY(flush_kernel_icache_range_asm)
         ldo             -1(%r23), %r21
         ANDCM           %r26, %r21, %r26
 
-1:      CMPB<<,n        %r26, %r25, 1b
+1:      cmpb,COND(<<),n %r26, %r25, 1b
         fic,m           %r23(%sr4, %r26)
 
         sync
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S
index 43874ca3ed67..d411dfb5b6d1 100644
--- a/arch/parisc/kernel/perf_asm.S
+++ b/arch/parisc/kernel/perf_asm.S
@@ -20,6 +20,8 @@
  */
 
 #include <asm/assembly.h>
+
+#include <linux/init.h>
 #include <linux/linkage.h>
 
 #ifdef CONFIG_64BIT
@@ -41,7 +43,7 @@
 ; The coprocessor only needs to be enabled when
 ; starting/stopping the coprocessor with the pmenb/pmdis.
 ;
-        .text
+        __HEAD
 
 ENTRY(perf_intrigue_enable_perf_counters)
         .proc
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S
index 7a92695d95a6..47fbdae6efd5 100644
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
@@ -12,6 +12,7 @@
 #include <asm/assembly.h>
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 
         .section        .bss
         .export real_stack
@@ -39,7 +40,7 @@ save_cr_end:
 /************************ 32-bit real-mode calls ***********************/
 /* This can be called in both narrow and wide kernels */
 
-        .text
+        __HEAD
 
         /* unsigned long real32_call_asm(unsigned int *sp,
          *              unsigned int *arg0p,
@@ -113,7 +114,7 @@ ENDPROC(real32_call_asm)
 #  define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where)
 #  define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r
 
-        .text
+        __HEAD
 save_control_regs:
         load32  PA(save_cr_space), %r28
         PUSH_CR(%cr24, %r28)
@@ -145,7 +146,7 @@ restore_control_regs:
 /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for
  * more general-purpose use by the several places which need RFIs
  */
-        .text
+        __HEAD
         .align 128
 rfi_virt2real:
         /* switch to real mode... */
@@ -180,7 +181,7 @@ rfi_v2r_1:
         bv      0(%r2)
         nop
 
-        .text
+        __HEAD
         .align 128
 rfi_real2virt:
         rsm             PSW_SM_I,%r0
@@ -218,7 +219,7 @@ rfi_r2v_1:
 
 /************************ 64-bit real-mode calls ***********************/
 /* This is only usable in wide kernels right now and will probably stay so */
-        .text
+        __HEAD
         /* unsigned long real64_call_asm(unsigned long *sp,
          *              unsigned long *arg0p,
          *              unsigned long fn)
@@ -276,7 +277,7 @@ ENDPROC(real64_call_asm)
 
 #endif
 
-        .text
+        __HEAD
         /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html
         **      GCC 3.3 and later has a new function in libgcc.a for
         **      comparing function pointers.
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 69b6eebc466e..ae509d8cd03f 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -17,6 +17,7 @@
 #include <asm/processor.h>
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 
         /* We fill the empty parts of the gateway page with
          * something that will kill the kernel or a
@@ -26,7 +27,7 @@
 
         .level          LEVEL
 
-        .text
+        __HEAD
 
         .import syscall_exit,code
         .import syscall_exit_rfi,code
@@ -636,7 +637,7 @@ END(sys_call_table64)
                 All light-weight-syscall atomic operations 
                 will use this set of locks 
         */
-        .section .data
+        .section .data, "aw"
         .align  PAGE_SIZE
 ENTRY(lws_lock_start)
         /* lws locks */
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 9dc6dc42f9cf..675f1d098f05 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -275,7 +275,7 @@ KERN_CRIT "                     ||     ||\n");
 
         /* Wot's wrong wif bein' racy? */
         if (current->thread.flags & PARISC_KERNEL_DEATH) {
-                printk(KERN_CRIT "%s() recursion detected.\n", __FUNCTION__);
+                printk(KERN_CRIT "%s() recursion detected.\n", __func__);
                 local_irq_enable();
                 while (1);
         }
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index aebf3c168871..e6f4b7a4b7e3 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -30,7 +30,7 @@
 /* #define DEBUG_UNALIGNED 1 */
 
 #ifdef DEBUG_UNALIGNED
-#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __FUNCTION__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
+#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __func__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
 #else
 #define DPRINTF(fmt, args...)
 #endif
@@ -460,7 +460,8 @@ void handle_unaligned(struct pt_regs *regs)
                         goto force_sigbus;
                 }
 
-                if (unaligned_count > 5 && jiffies - last_time > 5*HZ) {
+                if (unaligned_count > 5 &&
+                                time_after(jiffies, last_time + 5 * HZ)) {
                         unaligned_count = 0;
                         last_time = jiffies;
                 }
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S
index d172d4245cdc..4821ad6d5269 100644
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
@@ -23,6 +23,7 @@
 #include <asm/assembly.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 
 #ifdef CONFIG_SMP
         .macro  get_fault_ip t1 t2
@@ -55,7 +56,7 @@
 
         .level LEVEL
 
-        .text
+        __HEAD
         .section .fixup, "ax"
 
         /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S
index 1bd23ccec17b..b0d885350846 100644
--- a/arch/parisc/lib/lusercopy.S
+++ b/arch/parisc/lib/lusercopy.S
@@ -33,11 +33,12 @@
  */
 
 
-        .text
-        
 #include <asm/assembly.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
+
+        __HEAD
 
         /*
          * get_sr gets the appropriate space value into
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index d22042d33100..2d68431fc22e 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -91,7 +91,7 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
 #define THRESHOLD       16
 
 #ifdef DEBUG_MEMCPY
-#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __FUNCTION__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
+#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __func__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
 #else
 #define DPRINTF(fmt, args...)
 #endif
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index b0ed709d5743..78fe252b92c3 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -555,8 +555,6 @@ void show_mem(void)
 
         printk(KERN_INFO "Mem-info:\n");
         show_free_areas();
-        printk(KERN_INFO "Free swap:     %6ldkB\n",
-                                nr_swap_pages<<(PAGE_SHIFT-10));
 #ifndef CONFIG_DISCONTIGMEM
         i = max_mapnr;
         while (i-- > 0) {
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index dff0568e67ec..c93d1296cc0a 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -71,7 +71,7 @@ static ssize_t debug_input(struct file *file, const char __user *user_buf,
                         size_t user_len, loff_t * offset);
 static int debug_open(struct inode *inode, struct file *file);
 static int debug_close(struct inode *inode, struct file *file);
-static debug_info_t*  debug_info_create(char *name, int pages_per_area,
+static debug_info_t *debug_info_create(const char *name, int pages_per_area,
                         int nr_areas, int buf_size, mode_t mode);
 static void debug_info_get(debug_info_t *);
 static void debug_info_put(debug_info_t *);
@@ -234,8 +234,8 @@ fail_malloc_areas:
  */
 
 static debug_info_t*
-debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
-                int level, int mode)
+debug_info_alloc(const char *name, int pages_per_area, int nr_areas,
+                 int buf_size, int level, int mode)
 {
         debug_info_t* rc;
 
@@ -326,8 +326,8 @@ debug_info_free(debug_info_t* db_info){
  */
 
 static debug_info_t*
-debug_info_create(char *name, int pages_per_area, int nr_areas, int buf_size,
-                  mode_t mode)
+debug_info_create(const char *name, int pages_per_area, int nr_areas,
+                  int buf_size, mode_t mode)
 {
         debug_info_t* rc;
 
@@ -684,9 +684,9 @@ debug_close(struct inode *inode, struct file *file)
  * - Returns handle for debug area
  */
 
-debug_info_t *debug_register_mode(char *name, int pages_per_area, int nr_areas,
-                                  int buf_size, mode_t mode, uid_t uid,
-                                  gid_t gid)
+debug_info_t *debug_register_mode(const char *name, int pages_per_area,
+                                  int nr_areas, int buf_size, mode_t mode,
+                                  uid_t uid, gid_t gid)
 {
         debug_info_t *rc = NULL;
 
@@ -722,8 +722,8 @@ EXPORT_SYMBOL(debug_register_mode);
  * - returns handle for debug area
  */
 
-debug_info_t *debug_register(char *name, int pages_per_area, int nr_areas,
-                             int buf_size)
+debug_info_t *debug_register(const char *name, int pages_per_area,
+                             int nr_areas, int buf_size)
 {
         return debug_register_mode(name, pages_per_area, nr_areas, buf_size,
                                    S_IRUSR | S_IWUSR, 0, 0);
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c59a86dca584..e7c5bfb7c755 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -25,6 +25,7 @@ int show_interrupts(struct seq_file *p, void *v)
         static const char *intrclass_names[] = { "EXT", "I/O", };
         int i = *(loff_t *) v, j;
 
+        get_online_cpus();
         if (i == 0) {
                 seq_puts(p, "           ");
                 for_each_online_cpu(j)
@@ -43,7 +44,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_putc(p, '\n');
 
         }
-
+        put_online_cpus();
         return 0;
 }
 
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 0aeb290060d9..1f4228948dc4 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -139,7 +139,6 @@ static void __smp_call_function_map(void (*func) (void *info), void *info,
         if (wait)
                 data.finished = CPU_MASK_NONE;
 
-        spin_lock(&call_lock);
         call_data = &data;
 
         for_each_cpu_mask(cpu, map)
@@ -151,7 +150,6 @@ static void __smp_call_function_map(void (*func) (void *info), void *info,
         if (wait)
                 while (!cpus_equal(map, data.finished))
                         cpu_relax();
-        spin_unlock(&call_lock);
 out:
         if (local) {
                 local_irq_disable();
@@ -177,11 +175,11 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
 {
         cpumask_t map;
 
-        preempt_disable();
+        spin_lock(&call_lock);
         map = cpu_online_map;
         cpu_clear(smp_processor_id(), map);
         __smp_call_function_map(func, info, nonatomic, wait, map);
-        preempt_enable();
+        spin_unlock(&call_lock);
         return 0;
 }
 EXPORT_SYMBOL(smp_call_function);
@@ -202,10 +200,10 @@ EXPORT_SYMBOL(smp_call_function);
 int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
                              int nonatomic, int wait)
 {
-        preempt_disable();
+        spin_lock(&call_lock);
         __smp_call_function_map(func, info, nonatomic, wait,
                                 cpumask_of_cpu(cpu));
-        preempt_enable();
+        spin_unlock(&call_lock);
         return 0;
 }
 EXPORT_SYMBOL(smp_call_function_single);
@@ -228,10 +226,10 @@ EXPORT_SYMBOL(smp_call_function_single);
 int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
                            int wait)
 {
-        preempt_disable();
+        spin_lock(&call_lock);
         cpu_clear(smp_processor_id(), mask);
         __smp_call_function_map(func, info, 0, wait, mask);
-        preempt_enable();
+        spin_unlock(&call_lock);
         return 0;
 }
 EXPORT_SYMBOL(smp_call_function_mask);
@@ -592,7 +590,9 @@ int __cpuinit start_secondary(void *cpuvoid)
         pfault_init();
 
         /* Mark this cpu as online */
+        spin_lock(&call_lock);
         cpu_set(smp_processor_id(), cpu_online_map);
+        spin_unlock(&call_lock);
         /* Switch on interrupts */
         local_irq_enable();
         /* Print info about this processor */
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index beccacf907f3..ea2804808f39 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -27,19 +27,12 @@ struct memory_segment {
 
 static LIST_HEAD(mem_segs);
 
-static void __ref *vmem_alloc_pages(unsigned int order)
-{
-        if (slab_is_available())
-                return (void *)__get_free_pages(GFP_KERNEL, order);
-        return alloc_bootmem_pages((1 << order) * PAGE_SIZE);
-}
-
-static inline pud_t *vmem_pud_alloc(void)
+static pud_t *vmem_pud_alloc(void)
 {
         pud_t *pud = NULL;
 
 #ifdef CONFIG_64BIT
-        pud = vmem_alloc_pages(2);
+        pud = vmemmap_alloc_block(PAGE_SIZE * 4, 0);
         if (!pud)
                 return NULL;
         clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4);
@@ -47,12 +40,12 @@ static inline pud_t *vmem_pud_alloc(void)
         return pud;
 }
 
-static inline pmd_t *vmem_pmd_alloc(void)
+static pmd_t *vmem_pmd_alloc(void)
 {
         pmd_t *pmd = NULL;
 
 #ifdef CONFIG_64BIT
-        pmd = vmem_alloc_pages(2);
+        pmd = vmemmap_alloc_block(PAGE_SIZE * 4, 0);
         if (!pmd)
                 return NULL;
         clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4);
@@ -60,7 +53,7 @@ static inline pmd_t *vmem_pmd_alloc(void)
         return pmd;
 }
 
-static pte_t __init_refok *vmem_pte_alloc(void)
+static pte_t __ref *vmem_pte_alloc(void)
 {
         pte_t *pte;
 
@@ -214,7 +207,7 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                 if (pte_none(*pt_dir)) {
                         unsigned long new_page;
 
-                        new_page =__pa(vmem_alloc_pages(0));
+                        new_page =__pa(vmemmap_alloc_block(PAGE_SIZE, 0));
                         if (!new_page)
                                 goto out;
                         pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL);
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 7b76fd3b93a4..45cc3d9eacb8 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -418,7 +418,7 @@ void __suspend_report_result(const char *function, void *fn, int ret)
 {
         if (ret) {
                 printk(KERN_ERR "%s(): ", function);
-                print_fn_descriptor_symbol("%s() returns ", (unsigned long)fn);
+                print_fn_descriptor_symbol("%s returns ", fn);
                 printk("%d\n", ret);
         }
 }
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 19105ec203f7..8096389b0dc2 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -282,16 +282,20 @@ static int opost(unsigned char c, struct tty_struct *tty)
                         if (O_ONLRET(tty))
                                 tty->column = 0;
                         if (O_ONLCR(tty)) {
-                                if (space < 2)
+                                if (space < 2) {
+                                        unlock_kernel();
                                         return -1;
+                                }
                                 tty_put_char(tty, '\r');
                                 tty->column = 0;
                         }
                         tty->canon_column = tty->column;
                         break;
                 case '\r':
-                        if (O_ONOCR(tty) && tty->column == 0)
+                        if (O_ONOCR(tty) && tty->column == 0) {
+                                unlock_kernel();
                                 return 0;
+                        }
                         if (O_OCRNL(tty)) {
                                 c = '\n';
                                 if (O_ONLRET(tty))
@@ -303,10 +307,13 @@ static int opost(unsigned char c, struct tty_struct *tty)
                 case '\t':
                         spaces = 8 - (tty->column & 7);
                         if (O_TABDLY(tty) == XTABS) {
-                                if (space < spaces)
+                                if (space < spaces) {
+                                        unlock_kernel();
                                         return -1;
+                                }
                                 tty->column += spaces;
                                 tty->ops->write(tty, "        ", spaces);
+                                unlock_kernel();
                                 return 0;
                         }
                         tty->column += spaces;
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c
index 558420bc9f88..821369135369 100644
--- a/drivers/parisc/asp.c
+++ b/drivers/parisc/asp.c
@@ -88,7 +88,7 @@ asp_init_chip(struct parisc_device *dev)
         ret = -EBUSY;
         dev->irq = gsc_claim_irq(&gsc_irq, ASP_GSC_IRQ);
         if (dev->irq < 0) {
-                printk(KERN_ERR "%s(): cannot get GSC irq\n", __FUNCTION__);
+                printk(KERN_ERR "%s(): cannot get GSC irq\n", __func__);
                 goto out;
         }
 
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 07d2a8d4498f..b30e38f3a50d 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -359,7 +359,7 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
         BUG_ON((pages_needed * IOVP_SIZE) > DMA_CHUNK_SIZE);
      
         DBG_RES("%s() size: %d pages_needed %d\n", 
-                __FUNCTION__, size, pages_needed);
+                __func__, size, pages_needed);
 
         /*
         ** "seek and ye shall find"...praying never hurts either...
@@ -395,16 +395,16 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
 #endif
         } else {
                 panic("%s: %s() Too many pages to map. pages_needed: %u\n",
-                       __FILE__,  __FUNCTION__, pages_needed);
+                       __FILE__,  __func__, pages_needed);
         }
 
         panic("%s: %s() I/O MMU is out of mapping resources.\n", __FILE__,
-              __FUNCTION__);
+              __func__);
         
 resource_found:
         
         DBG_RES("%s() res_idx %d res_hint: %d\n",
-                __FUNCTION__, res_idx, ioc->res_hint);
+                __func__, res_idx, ioc->res_hint);
 
 #ifdef CCIO_SEARCH_TIME
         {
@@ -450,7 +450,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)
         BUG_ON(pages_mapped > BITS_PER_LONG);
 
         DBG_RES("%s():  res_idx: %d pages_mapped %d\n", 
-                __FUNCTION__, res_idx, pages_mapped);
+                __func__, res_idx, pages_mapped);
 
 #ifdef CCIO_MAP_STATS
         ioc->used_pages -= pages_mapped;
@@ -474,7 +474,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)
 #endif
         } else {
                 panic("%s:%s() Too many pages to unmap.\n", __FILE__,
-                      __FUNCTION__);
+                      __func__);
         }
 }
 
@@ -775,7 +775,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
         pdir_start = &(ioc->pdir_base[idx]);
 
         DBG_RUN("%s() 0x%p -> 0x%lx size: %0x%x\n",
-                __FUNCTION__, addr, (long)iovp | offset, size);
+                __func__, addr, (long)iovp | offset, size);
 
         /* If not cacheline aligned, force SAFE_DMA on the whole mess */
         if((size % L1_CACHE_BYTES) || ((unsigned long)addr % L1_CACHE_BYTES))
@@ -820,7 +820,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
         ioc = GET_IOC(dev);
 
         DBG_RUN("%s() iovp 0x%lx/%x\n",
-                __FUNCTION__, (long)iova, size);
+                __func__, (long)iova, size);
 
         iova ^= offset;        /* clear offset bits */
         size += offset;
@@ -922,7 +922,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
         BUG_ON(!dev);
         ioc = GET_IOC(dev);
         
-        DBG_RUN_SG("%s() START %d entries\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
 
         /* Fast path single entry scatterlists. */
         if (nents == 1) {
@@ -966,7 +966,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
         BUG_ON(coalesced != filled);
 
-        DBG_RUN_SG("%s() DONE %d mappings\n", __FUNCTION__, filled);
+        DBG_RUN_SG("%s() DONE %d mappings\n", __func__, filled);
 
         for (i = 0; i < filled; i++)
                 current_len += sg_dma_len(sglist + i);
@@ -995,7 +995,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
         ioc = GET_IOC(dev);
 
         DBG_RUN_SG("%s() START %d entries,  %08lx,%x\n",
-                __FUNCTION__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt_addr(sglist), sglist->length);
 
 #ifdef CCIO_MAP_STATS
         ioc->usg_calls++;
@@ -1011,7 +1011,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
                 ++sglist;
         }
 
-        DBG_RUN_SG("%s() DONE (nents %d)\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() DONE (nents %d)\n", __func__, nents);
 }
 
 static struct hppa_dma_ops ccio_ops = {
@@ -1225,7 +1225,7 @@ static int
 ccio_get_iotlb_size(struct parisc_device *dev)
 {
         if (dev->spa_shift == 0) {
-                panic("%s() : Can't determine I/O TLB size.\n", __FUNCTION__);
+                panic("%s() : Can't determine I/O TLB size.\n", __func__);
         }
         return (1 << dev->spa_shift);
 }
@@ -1315,7 +1315,7 @@ ccio_ioc_init(struct ioc *ioc)
         BUG_ON((1 << get_order(ioc->pdir_size)) != (ioc->pdir_size >> PAGE_SHIFT));
 
         DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
-                        __FUNCTION__, ioc->ioc_regs,
+                        __func__, ioc->ioc_regs,
                         (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
                         iova_space_size>>20,
                         iov_order + PAGE_SHIFT);
@@ -1323,7 +1323,7 @@ ccio_ioc_init(struct ioc *ioc)
         ioc->pdir_base = (u64 *)__get_free_pages(GFP_KERNEL, 
                                                  get_order(ioc->pdir_size));
         if(NULL == ioc->pdir_base) {
-                panic("%s() could not allocate I/O Page Table\n", __FUNCTION__);
+                panic("%s() could not allocate I/O Page Table\n", __func__);
         }
         memset(ioc->pdir_base, 0, ioc->pdir_size);
 
@@ -1332,12 +1332,12 @@ ccio_ioc_init(struct ioc *ioc)
 
         /* resource map size dictated by pdir_size */
         ioc->res_size = (ioc->pdir_size / sizeof(u64)) >> 3;
-        DBG_INIT("%s() res_size 0x%x\n", __FUNCTION__, ioc->res_size);
+        DBG_INIT("%s() res_size 0x%x\n", __func__, ioc->res_size);
         
         ioc->res_map = (u8 *)__get_free_pages(GFP_KERNEL, 
                                               get_order(ioc->res_size));
         if(NULL == ioc->res_map) {
-                panic("%s() could not allocate resource map\n", __FUNCTION__);
+                panic("%s() could not allocate resource map\n", __func__);
         }
         memset(ioc->res_map, 0, ioc->res_size);
 
@@ -1409,7 +1409,7 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
         result = insert_resource(&iomem_resource, res);
         if (result < 0) {
                 printk(KERN_ERR "%s() failed to claim CCIO bus address space (%08lx,%08lx)\n", 
-                        __FUNCTION__, res->start, res->end);
+                        __func__, res->start, res->end);
         }
 }
 
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d9c6322a721b..fd56128525d1 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -180,7 +180,7 @@ static int dino_cfg_read(struct pci_bus *bus, unsigned int devfn, int where,
         void __iomem *base_addr = d->hba.base_addr;
         unsigned long flags;
 
-        DBG("%s: %p, %d, %d, %d\n", __FUNCTION__, base_addr, devfn, where,
+        DBG("%s: %p, %d, %d, %d\n", __func__, base_addr, devfn, where,
                                                                         size);
         spin_lock_irqsave(&d->dinosaur_pen, flags);
 
@@ -215,7 +215,7 @@ static int dino_cfg_write(struct pci_bus *bus, unsigned int devfn, int where,
         void __iomem *base_addr = d->hba.base_addr;
         unsigned long flags;
 
-        DBG("%s: %p, %d, %d, %d\n", __FUNCTION__, base_addr, devfn, where,
+        DBG("%s: %p, %d, %d, %d\n", __func__, base_addr, devfn, where,
                                                                         size);
         spin_lock_irqsave(&d->dinosaur_pen, flags);
 
@@ -301,7 +301,7 @@ static void dino_disable_irq(unsigned int irq)
         struct dino_device *dino_dev = irq_desc[irq].chip_data;
         int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
 
         /* Clear the matching bit in the IMR register */
         dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq));
@@ -314,7 +314,7 @@ static void dino_enable_irq(unsigned int irq)
         int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
         u32 tmp;
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
 
         /*
         ** clear pending IRQ bits
@@ -340,7 +340,7 @@ static void dino_enable_irq(unsigned int irq)
         tmp = __raw_readl(dino_dev->hba.base_addr+DINO_ILR);
         if (tmp & DINO_MASK_IRQ(local_irq)) {
                 DBG(KERN_WARNING "%s(): IRQ asserted! (ILR 0x%x)\n",
-                                __FUNCTION__, tmp);
+                                __func__, tmp);
                 gsc_writel(dino_dev->txn_data, dino_dev->txn_addr);
         }
 }
@@ -388,7 +388,7 @@ ilr_again:
                 int local_irq = __ffs(mask);
                 int irq = dino_dev->global_irq[local_irq];
                 DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n",
-                        __FUNCTION__, irq, intr_dev, mask);
+                        __func__, irq, intr_dev, mask);
                 __do_IRQ(irq);
                 mask &= ~(1 << local_irq);
         } while (mask);
@@ -566,7 +566,7 @@ dino_fixup_bus(struct pci_bus *bus)
         int port_base = HBA_PORT_BASE(dino_dev->hba.hba_num);
 
         DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n",
-            __FUNCTION__, bus, bus->secondary, 
+            __func__, bus, bus->secondary,
             bus->bridge->platform_data);
 
         /* Firmware doesn't set up card-mode dino, so we have to */
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 1b3e3fd12d95..f7d088b897ee 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -112,7 +112,7 @@ static void gsc_asic_disable_irq(unsigned int irq)
         int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
         u32 imr;
 
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __FUNCTION__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
                         irq_dev->name, imr);
 
         /* Disable the IRQ line by clearing the bit in the IMR */
@@ -127,7 +127,7 @@ static void gsc_asic_enable_irq(unsigned int irq)
         int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
         u32 imr;
 
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __FUNCTION__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
                         irq_dev->name, imr);
 
         /* Enable the IRQ line by setting the bit in the IMR */
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index cb3d28176129..bee510098ce8 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -193,7 +193,7 @@ lasi_init_chip(struct parisc_device *dev)
         dev->irq = gsc_alloc_irq(&gsc_irq);
         if (dev->irq < 0) {
                 printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                                __FUNCTION__);
+                                __func__);
                 kfree(lasi);
                 return -EBUSY;
         }
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 66ce61048361..a28c8946deaa 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -377,12 +377,12 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
                 /* original - Generate config cycle on broken elroy
                   with risk we will miss PCI bus errors. */
                 *data = lba_rd_cfg(d, tok, pos, size);
-                DBG_CFG("%s(%x+%2x) -> 0x%x (a)\n", __FUNCTION__, tok, pos, *data);
+                DBG_CFG("%s(%x+%2x) -> 0x%x (a)\n", __func__, tok, pos, *data);
                 return 0;
         }
 
         if (LBA_SKIP_PROBE(d) && !lba_device_present(bus->secondary, devfn, d)) {
-                DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __FUNCTION__, tok, pos);
+                DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __func__, tok, pos);
                 /* either don't want to look or know device isn't present. */
                 *data = ~0U;
                 return(0);
@@ -398,7 +398,7 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
         case 2: *data = READ_REG16(data_reg + (pos & 2)); break;
         case 4: *data = READ_REG32(data_reg); break;
         }
-        DBG_CFG("%s(%x+%2x) -> 0x%x (c)\n", __FUNCTION__, tok, pos, *data);
+        DBG_CFG("%s(%x+%2x) -> 0x%x (c)\n", __func__, tok, pos, *data);
         return 0;
 }
 
@@ -441,16 +441,16 @@ static int elroy_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, int
         if (!LBA_SKIP_PROBE(d)) {
                 /* Original Workaround */
                 lba_wr_cfg(d, tok, pos, (u32) data, size);
-                DBG_CFG("%s(%x+%2x) = 0x%x (a)\n", __FUNCTION__, tok, pos,data);
+                DBG_CFG("%s(%x+%2x) = 0x%x (a)\n", __func__, tok, pos,data);
                 return 0;
         }
 
         if (LBA_SKIP_PROBE(d) && (!lba_device_present(bus->secondary, devfn, d))) {
-                DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __FUNCTION__, tok, pos,data);
+                DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __func__, tok, pos,data);
                 return 1; /* New Workaround */
         }
 
-        DBG_CFG("%s(%x+%2x) = 0x%x (c)\n", __FUNCTION__, tok, pos, data);
+        DBG_CFG("%s(%x+%2x) = 0x%x (c)\n", __func__, tok, pos, data);
 
         /* Basic Algorithm */
         LBA_CFG_ADDR_SETUP(d, tok | pos);
@@ -521,7 +521,7 @@ static int mercury_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, i
         if ((pos > 255) || (devfn > 255))
                 return -EINVAL;
 
-        DBG_CFG("%s(%x+%2x) <- 0x%x (c)\n", __FUNCTION__, tok, pos, data);
+        DBG_CFG("%s(%x+%2x) <- 0x%x (c)\n", __func__, tok, pos, data);
 
         LBA_CFG_TR4_ADDR_SETUP(d, tok | pos);
         switch(size) {
@@ -890,7 +890,7 @@ LBA_PORT_IN(32, 0)
 #define LBA_PORT_OUT(size, mask) \
 static void lba_astro_out##size (struct pci_hba_data *d, u16 addr, u##size val) \
 { \
-        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, d, addr, val); \
+        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, d, addr, val); \
         WRITE_REG##size(val, astro_iop_base + addr); \
         if (LBA_DEV(d)->hw_rev < 3) \
                 lba_t32 = READ_U32(d->base_addr + LBA_FUNC_ID); \
@@ -932,7 +932,7 @@ static struct pci_port_ops lba_astro_port_ops = {
 static u##size lba_pat_in##size (struct pci_hba_data *l, u16 addr) \
 { \
         u##size t; \
-        DBG_PORT("%s(0x%p, 0x%x) ->", __FUNCTION__, l, addr); \
+        DBG_PORT("%s(0x%p, 0x%x) ->", __func__, l, addr); \
         t = READ_REG##size(PIOP_TO_GMMIO(LBA_DEV(l), addr)); \
         DBG_PORT(" 0x%x\n", t); \
         return (t); \
@@ -948,7 +948,7 @@ LBA_PORT_IN(32, 0)
 static void lba_pat_out##size (struct pci_hba_data *l, u16 addr, u##size val) \
 { \
         void __iomem *where = PIOP_TO_GMMIO(LBA_DEV(l), addr); \
-        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, l, addr, val); \
+        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, l, addr, val); \
         WRITE_REG##size(val, where); \
         /* flush the I/O down to the elroy at least */ \
         lba_t32 = READ_U32(l->base_addr + LBA_FUNC_ID); \
@@ -1584,7 +1584,7 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
         WARN_ON((ibase & 0x001fffff) != 0);
         WARN_ON((imask & 0x001fffff) != 0);
         
-        DBG("%s() ibase 0x%x imask 0x%x\n", __FUNCTION__, ibase, imask);
+        DBG("%s() ibase 0x%x imask 0x%x\n", __func__, ibase, imask);
         WRITE_REG32( imask, base_addr + LBA_IMASK);
         WRITE_REG32( ibase, base_addr + LBA_IBASE);
         iounmap(base_addr);
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 703b85edb004..f9b12664f9fb 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -569,7 +569,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
 
         default:
                 printk(KERN_ERR "%s: Wrong LCD/LED model %d !\n",
-                       __FUNCTION__, lcd_info.model);
+                       __func__, lcd_info.model);
                 return 1;
         }
         
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index afc849bd3f58..bc73b96346ff 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -384,7 +384,7 @@ sba_search_bitmap(struct ioc *ioc, struct device *dev,
                 }
                 mask = RESMAP_MASK(bits_wanted) >> bitshiftcnt;
 
-                DBG_RES("%s() o %ld %p", __FUNCTION__, o, res_ptr);
+                DBG_RES("%s() o %ld %p", __func__, o, res_ptr);
                 while(res_ptr < res_end)
                 { 
                         DBG_RES("    %p %lx %lx\n", res_ptr, mask, *res_ptr);
@@ -454,7 +454,7 @@ sba_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
 #endif
 
         DBG_RES("%s(%x) %d -> %lx hint %x/%x\n",
-                __FUNCTION__, size, pages_needed, pide,
+                __func__, size, pages_needed, pide,
                 (uint) ((unsigned long) ioc->res_hint - (unsigned long) ioc->res_map),
                 ioc->res_bitshift );
 
@@ -497,7 +497,7 @@ sba_free_range(struct ioc *ioc, dma_addr_t iova, size_t size)
         unsigned long m = RESMAP_MASK(bits_not_wanted) >> (pide & (BITS_PER_LONG - 1));
 
         DBG_RES("%s( ,%x,%x) %x/%lx %x %p %lx\n",
-                __FUNCTION__, (uint) iova, size,
+                __func__, (uint) iova, size,
                 bits_not_wanted, m, pide, res_ptr, *res_ptr);
 
 #ifdef SBA_COLLECT_STATS
@@ -740,7 +740,7 @@ sba_map_single(struct device *dev, void *addr, size_t size,
         iovp = (dma_addr_t) pide << IOVP_SHIFT;
 
         DBG_RUN("%s() 0x%p -> 0x%lx\n",
-                __FUNCTION__, addr, (long) iovp | offset);
+                __func__, addr, (long) iovp | offset);
 
         pdir_start = &(ioc->pdir_base[pide]);
 
@@ -798,7 +798,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
         unsigned long flags; 
         dma_addr_t offset;
 
-        DBG_RUN("%s() iovp 0x%lx/%x\n", __FUNCTION__, (long) iova, size);
+        DBG_RUN("%s() iovp 0x%lx/%x\n", __func__, (long) iova, size);
 
         ioc = GET_IOC(dev);
         offset = iova & ~IOVP_MASK;
@@ -937,7 +937,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
         int coalesced, filled = 0;
         unsigned long flags;
 
-        DBG_RUN_SG("%s() START %d entries\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
 
         ioc = GET_IOC(dev);
 
@@ -998,7 +998,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 
-        DBG_RUN_SG("%s() DONE %d mappings\n", __FUNCTION__, filled);
+        DBG_RUN_SG("%s() DONE %d mappings\n", __func__, filled);
 
         return filled;
 }
@@ -1023,7 +1023,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
 #endif
 
         DBG_RUN_SG("%s() START %d entries,  %p,%x\n",
-                __FUNCTION__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt_addr(sglist), sglist->length);
 
         ioc = GET_IOC(dev);
 
@@ -1047,7 +1047,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
                 ++sglist;
         }
 
-        DBG_RUN_SG("%s() DONE (nents %d)\n", __FUNCTION__,  nents);
+        DBG_RUN_SG("%s() DONE (nents %d)\n", __func__,  nents);
 
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
@@ -1118,7 +1118,7 @@ sba_alloc_pdir(unsigned int pdir_size)
         pdir_base = __get_free_pages(GFP_KERNEL, pdir_order);
         if (NULL == (void *) pdir_base) {
                 panic("%s() could not allocate I/O Page Table\n",
-                        __FUNCTION__);
+                        __func__);
         }
 
         /* If this is not PA8700 (PCX-W2)
@@ -1261,7 +1261,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ioc->pdir_size = (iova_space_size / IOVP_SIZE) * sizeof(u64);
 
         DBG_INIT("%s() hpa 0x%p IOV %dMB (%d bits)\n",
-                __FUNCTION__, ioc->ioc_hpa, iova_space_size >> 20,
+                __func__, ioc->ioc_hpa, iova_space_size >> 20,
                 iov_order + PAGE_SHIFT);
 
         ioc->pdir_base = (void *) __get_free_pages(GFP_KERNEL,
@@ -1272,7 +1272,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         memset(ioc->pdir_base, 0, ioc->pdir_size);
 
         DBG_INIT("%s() pdir %p size %x\n",
-                        __FUNCTION__, ioc->pdir_base, ioc->pdir_size);
+                        __func__, ioc->pdir_base, ioc->pdir_size);
 
 #ifdef SBA_HINT_SUPPORT
         ioc->hint_shift_pdir = iov_order + PAGE_SHIFT;
@@ -1354,7 +1354,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 
         if (agp_found && sba_reserve_agpgart) {
                 printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n",
-                       __FUNCTION__, (iova_space_size/2) >> 20);
+                       __func__, (iova_space_size/2) >> 20);
                 ioc->pdir_size /= 2;
                 ioc->pdir_base[PDIR_INDEX(iova_space_size/2)] = SBA_AGPGART_COOKIE;
         }
@@ -1406,7 +1406,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ioc->pdir_size = pdir_size = (iova_space_size/IOVP_SIZE) * sizeof(u64);
 
         DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
-                        __FUNCTION__,
+                        __func__,
                         ioc->ioc_hpa,
                         (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
                         iova_space_size>>20,
@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ioc->pdir_base = sba_alloc_pdir(pdir_size);
 
         DBG_INIT("%s() pdir %p size %x\n",
-                        __FUNCTION__, ioc->pdir_base, pdir_size);
+                        __func__, ioc->pdir_base, pdir_size);
 
 #ifdef SBA_HINT_SUPPORT
         /* FIXME : DMA HINTs not used */
@@ -1443,7 +1443,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 #endif
 
         DBG_INIT("%s() IOV base 0x%lx mask 0x%0lx\n",
-                __FUNCTION__, ioc->ibase, ioc->imask);
+                __func__, ioc->ibase, ioc->imask);
 
         /*
         ** FIXME: Hint registers are programmed with default hint
@@ -1470,7 +1470,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 
         ioc->ibase = 0; /* used by SBA_IOVA and related macros */       
 
-        DBG_INIT("%s() DONE\n", __FUNCTION__);
+        DBG_INIT("%s() DONE\n", __func__);
 }
 
 
@@ -1544,7 +1544,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
         if (!IS_PLUTO(sba_dev->dev)) {
                 ioc_ctl = READ_REG(sba_dev->sba_hpa+IOC_CTRL);
                 DBG_INIT("%s() hpa 0x%lx ioc_ctl 0x%Lx ->",
-                        __FUNCTION__, sba_dev->sba_hpa, ioc_ctl);
+                        __func__, sba_dev->sba_hpa, ioc_ctl);
                 ioc_ctl &= ~(IOC_CTRL_RM | IOC_CTRL_NC | IOC_CTRL_CE);
                 ioc_ctl |= IOC_CTRL_DD | IOC_CTRL_D4 | IOC_CTRL_TC;
                         /* j6700 v1.6 firmware sets 0x294f */
@@ -1675,7 +1675,7 @@ sba_common_init(struct sba_device *sba_dev)
 
                 res_size >>= 3;  /* convert bit count to byte count */
                 DBG_INIT("%s() res_size 0x%x\n",
-                        __FUNCTION__, res_size);
+                        __func__, res_size);
 
                 sba_dev->ioc[i].res_size = res_size;
                 sba_dev->ioc[i].res_map = (char *) __get_free_pages(GFP_KERNEL, get_order(res_size));
@@ -1688,7 +1688,7 @@ sba_common_init(struct sba_device *sba_dev)
                 if (NULL == sba_dev->ioc[i].res_map)
                 {
                         panic("%s:%s() could not allocate resource map\n",
-                              __FILE__, __FUNCTION__ );
+                              __FILE__, __func__ );
                 }
 
                 memset(sba_dev->ioc[i].res_map, 0, res_size);
@@ -1725,7 +1725,7 @@ sba_common_init(struct sba_device *sba_dev)
 #endif
 
                 DBG_INIT("%s() %d res_map %x %p\n",
-                        __FUNCTION__, i, res_size, sba_dev->ioc[i].res_map);
+                        __func__, i, res_size, sba_dev->ioc[i].res_map);
         }
 
         spin_lock_init(&sba_dev->sba_lock);
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 813c2c24ab1e..892a83bbe73d 100644
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -93,7 +93,7 @@ wax_init_chip(struct parisc_device *dev)
         dev->irq = gsc_claim_irq(&gsc_irq, WAX_GSC_IRQ);
         if (dev->irq < 0) {
                 printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                                __FUNCTION__);
+                                __func__);
                 kfree(wax);
                 return -EBUSY;
         }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f2d9c770f51a..dabb563f51d9 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1503,8 +1503,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f
                     (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
 #ifdef DEBUG
                         dev_dbg(&dev->dev, "calling ");
-                        print_fn_descriptor_symbol("%s()\n",
-                                (unsigned long) f->hook);
+                        print_fn_descriptor_symbol("%s\n", f->hook);
 #endif
                         f->hook(dev);
                 }
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index ffdb12a59c40..e2b7de4cb05e 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -331,8 +331,7 @@ void pnp_fixup_device(struct pnp_dev *dev)
                         continue;
 #ifdef DEBUG
                 dev_dbg(&dev->dev, "%s: calling ", f->id);
-                print_fn_descriptor_symbol("%s\n",
-                                (unsigned long) f->quirk_function);
+                print_fn_descriptor_symbol("%s\n", f->quirk_function);
 #endif
                 f->quirk_function(dev);
         }
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ac6d4d3218b3..8ba3f135da22 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -925,6 +925,8 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
         struct dasd_ccw_req *cqr;
         struct dasd_device *device;
 
+        if (!intparm)
+                return;
         cqr = (struct dasd_ccw_req *) intparm;
         if (cqr->status != DASD_CQR_IN_IO) {
                 MESSAGE(KERN_DEBUG,
@@ -976,17 +978,16 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (IS_ERR(irb)) {
                 switch (PTR_ERR(irb)) {
                 case -EIO:
-                        dasd_handle_killed_request(cdev, intparm);
                         break;
                 case -ETIMEDOUT:
                         printk(KERN_WARNING"%s(%s): request timed out\n",
                                __func__, cdev->dev.bus_id);
-                        //FIXME - dasd uses own timeout interface...
                         break;
                 default:
                         printk(KERN_WARNING"%s(%s): unknown error %ld\n",
                                __func__, cdev->dev.bus_id, PTR_ERR(irb));
                 }
+                dasd_handle_killed_request(cdev, intparm);
                 return;
         }
 
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index f4fb40257348..d774e79476fe 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -86,10 +86,10 @@ static DEFINE_SPINLOCK(dasd_devmap_lock);
 static struct list_head dasd_hashlists[256];
 int dasd_max_devindex;
 
-static struct dasd_devmap *dasd_add_busid(char *, int);
+static struct dasd_devmap *dasd_add_busid(const char *, int);
 
 static inline int
-dasd_hash_busid(char *bus_id)
+dasd_hash_busid(const char *bus_id)
 {
         int hash, i;
 
@@ -394,7 +394,7 @@ dasd_parse(void)
  * devices.
  */
 static struct dasd_devmap *
-dasd_add_busid(char *bus_id, int features)
+dasd_add_busid(const char *bus_id, int features)
 {
         struct dasd_devmap *devmap, *new, *tmp;
         int hash;
@@ -430,7 +430,7 @@ dasd_add_busid(char *bus_id, int features)
  * Find devmap for device with given bus_id.
  */
 static struct dasd_devmap *
-dasd_find_busid(char *bus_id)
+dasd_find_busid(const char *bus_id)
 {
         struct dasd_devmap *devmap, *tmp;
         int hash;
@@ -452,7 +452,7 @@ dasd_find_busid(char *bus_id)
  * Check if busid has been added to the list of dasd ranges.
  */
 int
-dasd_busid_known(char *bus_id)
+dasd_busid_known(const char *bus_id)
 {
         return IS_ERR(dasd_find_busid(bus_id)) ? -ENOENT : 0;
 }
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 6c624bf44617..fb2f931cf844 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -598,7 +598,7 @@ struct dasd_device *dasd_device_from_cdev_locked(struct ccw_device *);
 struct dasd_device *dasd_device_from_devindex(int);
 
 int dasd_parse(void);
-int dasd_busid_known(char *);
+int dasd_busid_known(const char *);
 
 /* externals in dasd_gendisk.c */
 int  dasd_gendisk_init(void);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7ad8cf157641..76e44eb7c47f 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -76,32 +76,9 @@ const char *tape_op_verbose[TO_SIZE] =
         [TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC",
 };
 
-static int
-busid_to_int(char *bus_id)
+static int devid_to_int(struct ccw_dev_id *dev_id)
 {
-        int     dec;
-        int     d;
-        char *  s;
-
-        for(s = bus_id, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = d;
-        for(s++, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = (dec << 8) + d;
-
-        for(s++; *s != '\0'; s++) {
-                if (*s >= '0' && *s <= '9') {
-                        d = *s - '0';
-                } else if (*s >= 'a' && *s <= 'f') {
-                        d = *s - 'a' + 10;
-                } else {
-                        d = *s - 'A' + 10;
-                }
-                dec = (dec << 4) + d;
-        }
-
-        return dec;
+        return dev_id->devno + (dev_id->ssid << 16);
 }
 
 /*
@@ -551,6 +528,7 @@ tape_generic_probe(struct ccw_device *cdev)
 {
         struct tape_device *device;
         int ret;
+        struct ccw_dev_id dev_id;
 
         device = tape_alloc_device();
         if (IS_ERR(device))
@@ -565,7 +543,8 @@ tape_generic_probe(struct ccw_device *cdev)
         cdev->dev.driver_data = device;
         cdev->handler = __tape_do_irq;
         device->cdev = cdev;
-        device->cdev_id = busid_to_int(cdev->dev.bus_id);
+        ccw_device_get_id(cdev, &dev_id);
+        device->cdev_id = devid_to_int(&dev_id);
         PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
         return ret;
 }
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index d364e0bfae12..e8487347e4d4 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -858,7 +858,7 @@ static int __init vmlogrdr_init(void)
         for (i=0; i < MAXMINOR; ++i ) {
                 sys_ser[i].buffer = (char *) get_zeroed_page(GFP_KERNEL);
                 if (!sys_ser[i].buffer) {
-                        rc = ENOMEM;
+                        rc = -ENOMEM;
                         break;
                 }
                 sys_ser[i].current_position = sys_ser[i].buffer;
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 9c21b8f43f9b..a4a5f2efea48 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -19,7 +19,6 @@
 
 #include <asm/cio.h>
 #include <asm/uaccess.h>
-#include <asm/cio.h>
 
 #include "blacklist.h"
 #include "cio.h"
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index ba559053402e..5cf7be008e98 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -243,16 +243,10 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
         /* Setup sense path group id channel program. */
         cdev->private->pgid[0].inf.fc = func;
         ccw = cdev->private->iccws;
-        if (!cdev->private->flags.pgid_single) {
-                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
-                ccw->cmd_code = CCW_CMD_SUSPEND_RECONN;
-                ccw->cda = 0;
-                ccw->count = 0;
-                ccw->flags = CCW_FLAG_SLI | CCW_FLAG_CC;
-                ccw++;
-        } else
+        if (cdev->private->flags.pgid_single)
                 cdev->private->pgid[0].inf.fc |= SPID_FUNC_SINGLE_PATH;
-
+        else
+                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
         ccw->cmd_code = CCW_CMD_SET_PGID;
         ccw->cda = (__u32) __pa (&cdev->private->pgid[0]);
         ccw->count = sizeof (struct pgid);
diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h
index 9f020eb825c5..0721a5e8271e 100644
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
@@ -126,6 +126,8 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);
 #  include <asm/machvec_hpzx1_swiotlb.h>
 # elif defined (CONFIG_IA64_SGI_SN2)
 #  include <asm/machvec_sn2.h>
+# elif defined (CONFIG_IA64_SGI_UV)
+#  include <asm/machvec_uv.h>
 # elif defined (CONFIG_IA64_GENERIC)
 
 # ifdef MACHVEC_PLATFORM_HEADER
diff --git a/include/asm-ia64/machvec_uv.h b/include/asm-ia64/machvec_uv.h
new file mode 100644
index 000000000000..2931447f3813
--- /dev/null
+++ b/include/asm-ia64/machvec_uv.h
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ *
+ * SGI UV Core Functions
+ *
+ * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
+ */
+
+#ifndef _ASM_IA64_MACHVEC_UV_H
+#define _ASM_IA64_MACHVEC_UV_H
+
+extern ia64_mv_setup_t uv_setup;
+
+/*
+ * This stuff has dual use!
+ *
+ * For a generic kernel, the macros are used to initialize the
+ * platform's machvec structure.  When compiling a non-generic kernel,
+ * the macros are used directly.
+ */
+#define platform_name                   "uv"
+#define platform_setup                  uv_setup
+
+#endif /* _ASM_IA64_MACHVEC_UV_H */
diff --git a/include/asm-ia64/uv/uv_hub.h b/include/asm-ia64/uv/uv_hub.h
new file mode 100644
index 000000000000..f607018af4a1
--- /dev/null
+++ b/include/asm-ia64/uv/uv_hub.h
@@ -0,0 +1,309 @@
+/*
+ * 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.
+ *
+ * SGI UV architectural definitions
+ *
+ * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
+ */
+
+#ifndef __ASM_IA64_UV_HUB_H__
+#define __ASM_IA64_UV_HUB_H__
+
+#include <linux/numa.h>
+#include <linux/percpu.h>
+#include <asm/types.h>
+#include <asm/percpu.h>
+
+
+/*
+ * Addressing Terminology
+ *
+ *      M       - The low M bits of a physical address represent the offset
+ *                into the blade local memory. RAM memory on a blade is physically
+ *                contiguous (although various IO spaces may punch holes in
+ *                it)..
+ *
+ *      N       - Number of bits in the node portion of a socket physical
+ *                address.
+ *
+ *      NASID   - network ID of a router, Mbrick or Cbrick. Nasid values of
+ *                routers always have low bit of 1, C/MBricks have low bit
+ *                equal to 0. Most addressing macros that target UV hub chips
+ *                right shift the NASID by 1 to exclude the always-zero bit.
+ *                NASIDs contain up to 15 bits.
+ *
+ *      GNODE   - NASID right shifted by 1 bit. Most mmrs contain gnodes instead
+ *                of nasids.
+ *
+ *      PNODE   - the low N bits of the GNODE. The PNODE is the most useful variant
+ *                of the nasid for socket usage.
+ *
+ *
+ *  NumaLink Global Physical Address Format:
+ *  +--------------------------------+---------------------+
+ *  |00..000|      GNODE             |      NodeOffset     |
+ *  +--------------------------------+---------------------+
+ *          |<-------53 - M bits --->|<--------M bits ----->
+ *
+ *      M - number of node offset bits (35 .. 40)
+ *
+ *
+ *  Memory/UV-HUB Processor Socket Address Format:
+ *  +----------------+---------------+---------------------+
+ *  |00..000000000000|   PNODE       |      NodeOffset     |
+ *  +----------------+---------------+---------------------+
+ *                   <--- N bits --->|<--------M bits ----->
+ *
+ *      M - number of node offset bits (35 .. 40)
+ *      N - number of PNODE bits (0 .. 10)
+ *
+ *              Note: M + N cannot currently exceed 44 (x86_64) or 46 (IA64).
+ *              The actual values are configuration dependent and are set at
+ *              boot time. M & N values are set by the hardware/BIOS at boot.
+ */
+
+
+/*
+ * Maximum number of bricks in all partitions and in all coherency domains.
+ * This is the total number of bricks accessible in the numalink fabric. It
+ * includes all C & M bricks. Routers are NOT included.
+ *
+ * This value is also the value of the maximum number of non-router NASIDs
+ * in the numalink fabric.
+ *
+ * NOTE: a brick may contain 1 or 2 OS nodes. Don't get these confused.
+ */
+#define UV_MAX_NUMALINK_BLADES  16384
+
+/*
+ * Maximum number of C/Mbricks within a software SSI (hardware may support
+ * more).
+ */
+#define UV_MAX_SSI_BLADES       1
+
+/*
+ * The largest possible NASID of a C or M brick (+ 2)
+ */
+#define UV_MAX_NASID_VALUE      (UV_MAX_NUMALINK_NODES * 2)
+
+/*
+ * The following defines attributes of the HUB chip. These attributes are
+ * frequently referenced and are kept in the per-cpu data areas of each cpu.
+ * They are kept together in a struct to minimize cache misses.
+ */
+struct uv_hub_info_s {
+        unsigned long   global_mmr_base;
+        unsigned long   gpa_mask;
+        unsigned long   gnode_upper;
+        unsigned long   lowmem_remap_top;
+        unsigned long   lowmem_remap_base;
+        unsigned short  pnode;
+        unsigned short  pnode_mask;
+        unsigned short  coherency_domain_number;
+        unsigned short  numa_blade_id;
+        unsigned char   blade_processor_id;
+        unsigned char   m_val;
+        unsigned char   n_val;
+};
+DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
+#define uv_hub_info             (&__get_cpu_var(__uv_hub_info))
+#define uv_cpu_hub_info(cpu)    (&per_cpu(__uv_hub_info, cpu))
+
+/*
+ * Local & Global MMR space macros.
+ *      Note: macros are intended to be used ONLY by inline functions
+ *      in this file - not by other kernel code.
+ *              n -  NASID (full 15-bit global nasid)
+ *              g -  GNODE (full 15-bit global nasid, right shifted 1)
+ *              p -  PNODE (local part of nsids, right shifted 1)
+ */
+#define UV_NASID_TO_PNODE(n)            (((n) >> 1) & uv_hub_info->pnode_mask)
+#define UV_PNODE_TO_NASID(p)            (((p) << 1) | uv_hub_info->gnode_upper)
+
+#define UV_LOCAL_MMR_BASE               0xf4000000UL
+#define UV_GLOBAL_MMR32_BASE            0xf8000000UL
+#define UV_GLOBAL_MMR64_BASE            (uv_hub_info->global_mmr_base)
+
+#define UV_GLOBAL_MMR32_PNODE_SHIFT     15
+#define UV_GLOBAL_MMR64_PNODE_SHIFT     26
+
+#define UV_GLOBAL_MMR32_PNODE_BITS(p)   ((p) << (UV_GLOBAL_MMR32_PNODE_SHIFT))
+
+#define UV_GLOBAL_MMR64_PNODE_BITS(p)                                   \
+        ((unsigned long)(p) << UV_GLOBAL_MMR64_PNODE_SHIFT)
+
+/*
+ * Macros for converting between kernel virtual addresses, socket local physical
+ * addresses, and UV global physical addresses.
+ *      Note: use the standard __pa() & __va() macros for converting
+ *            between socket virtual and socket physical addresses.
+ */
+
+/* socket phys RAM --> UV global physical address */
+static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr)
+{
+        if (paddr < uv_hub_info->lowmem_remap_top)
+                paddr += uv_hub_info->lowmem_remap_base;
+        return paddr | uv_hub_info->gnode_upper;
+}
+
+
+/* socket virtual --> UV global physical address */
+static inline unsigned long uv_gpa(void *v)
+{
+        return __pa(v) | uv_hub_info->gnode_upper;
+}
+
+/* socket virtual --> UV global physical address */
+static inline void *uv_vgpa(void *v)
+{
+        return (void *)uv_gpa(v);
+}
+
+/* UV global physical address --> socket virtual */
+static inline void *uv_va(unsigned long gpa)
+{
+        return __va(gpa & uv_hub_info->gpa_mask);
+}
+
+/* pnode, offset --> socket virtual */
+static inline void *uv_pnode_offset_to_vaddr(int pnode, unsigned long offset)
+{
+        return __va(((unsigned long)pnode << uv_hub_info->m_val) | offset);
+}
+
+
+/*
+ * Access global MMRs using the low memory MMR32 space. This region supports
+ * faster MMR access but not all MMRs are accessible in this space.
+ */
+static inline unsigned long *uv_global_mmr32_address(int pnode,
+                                unsigned long offset)
+{
+        return __va(UV_GLOBAL_MMR32_BASE |
+                       UV_GLOBAL_MMR32_PNODE_BITS(pnode) | offset);
+}
+
+static inline void uv_write_global_mmr32(int pnode, unsigned long offset,
+                                 unsigned long val)
+{
+        *uv_global_mmr32_address(pnode, offset) = val;
+}
+
+static inline unsigned long uv_read_global_mmr32(int pnode,
+                                                 unsigned long offset)
+{
+        return *uv_global_mmr32_address(pnode, offset);
+}
+
+/*
+ * Access Global MMR space using the MMR space located at the top of physical
+ * memory.
+ */
+static inline unsigned long *uv_global_mmr64_address(int pnode,
+                                unsigned long offset)
+{
+        return __va(UV_GLOBAL_MMR64_BASE |
+                    UV_GLOBAL_MMR64_PNODE_BITS(pnode) | offset);
+}
+
+static inline void uv_write_global_mmr64(int pnode, unsigned long offset,
+                                unsigned long val)
+{
+        *uv_global_mmr64_address(pnode, offset) = val;
+}
+
+static inline unsigned long uv_read_global_mmr64(int pnode,
+                                                 unsigned long offset)
+{
+        return *uv_global_mmr64_address(pnode, offset);
+}
+
+/*
+ * Access hub local MMRs. Faster than using global space but only local MMRs
+ * are accessible.
+ */
+static inline unsigned long *uv_local_mmr_address(unsigned long offset)
+{
+        return __va(UV_LOCAL_MMR_BASE | offset);
+}
+
+static inline unsigned long uv_read_local_mmr(unsigned long offset)
+{
+        return *uv_local_mmr_address(offset);
+}
+
+static inline void uv_write_local_mmr(unsigned long offset, unsigned long val)
+{
+        *uv_local_mmr_address(offset) = val;
+}
+
+/*
+ * Structures and definitions for converting between cpu, node, pnode, and blade
+ * numbers.
+ */
+
+/* Blade-local cpu number of current cpu. Numbered 0 .. <# cpus on the blade> */
+static inline int uv_blade_processor_id(void)
+{
+        return smp_processor_id();
+}
+
+/* Blade number of current cpu. Numnbered 0 .. <#blades -1> */
+static inline int uv_numa_blade_id(void)
+{
+        return 0;
+}
+
+/* Convert a cpu number to the the UV blade number */
+static inline int uv_cpu_to_blade_id(int cpu)
+{
+        return 0;
+}
+
+/* Convert linux node number to the UV blade number */
+static inline int uv_node_to_blade_id(int nid)
+{
+        return 0;
+}
+
+/* Convert a blade id to the PNODE of the blade */
+static inline int uv_blade_to_pnode(int bid)
+{
+        return 0;
+}
+
+/* Determine the number of possible cpus on a blade */
+static inline int uv_blade_nr_possible_cpus(int bid)
+{
+        return num_possible_cpus();
+}
+
+/* Determine the number of online cpus on a blade */
+static inline int uv_blade_nr_online_cpus(int bid)
+{
+        return num_online_cpus();
+}
+
+/* Convert a cpu id to the PNODE of the blade containing the cpu */
+static inline int uv_cpu_to_pnode(int cpu)
+{
+        return 0;
+}
+
+/* Convert a linux node number to the PNODE of the blade */
+static inline int uv_node_to_pnode(int nid)
+{
+        return 0;
+}
+
+/* Maximum possible number of blades */
+static inline int uv_num_possible_blades(void)
+{
+        return 1;
+}
+
+#endif /* __ASM_IA64_UV_HUB__ */
+
diff --git a/include/asm-ia64/uv/uv_mmrs.h b/include/asm-ia64/uv/uv_mmrs.h
new file mode 100644
index 000000000000..1cc1dbb0182f
--- /dev/null
+++ b/include/asm-ia64/uv/uv_mmrs.h
@@ -0,0 +1,266 @@
+/*
+ * 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.
+ *
+ * SGI UV MMR definitions
+ *
+ * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
+ */
+
+#ifndef __ASM_IA64_UV_MMRS__
+#define __ASM_IA64_UV_MMRS__
+
+/*
+ *       AUTO GENERATED - Do not edit
+ */
+
+ #define UV_MMR_ENABLE          (1UL << 63)
+
+/* ========================================================================= */
+/*                               UVH_NODE_ID                                 */
+/* ========================================================================= */
+#define UVH_NODE_ID 0x0UL
+
+#define UVH_NODE_ID_FORCE1_SHFT 0
+#define UVH_NODE_ID_FORCE1_MASK 0x0000000000000001UL
+#define UVH_NODE_ID_MANUFACTURER_SHFT 1
+#define UVH_NODE_ID_MANUFACTURER_MASK 0x0000000000000ffeUL
+#define UVH_NODE_ID_PART_NUMBER_SHFT 12
+#define UVH_NODE_ID_PART_NUMBER_MASK 0x000000000ffff000UL
+#define UVH_NODE_ID_REVISION_SHFT 28
+#define UVH_NODE_ID_REVISION_MASK 0x00000000f0000000UL
+#define UVH_NODE_ID_NODE_ID_SHFT 32
+#define UVH_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL
+#define UVH_NODE_ID_NODES_PER_BIT_SHFT 48
+#define UVH_NODE_ID_NODES_PER_BIT_MASK 0x007f000000000000UL
+#define UVH_NODE_ID_NI_PORT_SHFT 56
+#define UVH_NODE_ID_NI_PORT_MASK 0x0f00000000000000UL
+
+union uvh_node_id_u {
+    unsigned long       v;
+    struct uvh_node_id_s {
+        unsigned long   force1        :  1;  /* RO */
+        unsigned long   manufacturer  : 11;  /* RO */
+        unsigned long   part_number   : 16;  /* RO */
+        unsigned long   revision      :  4;  /* RO */
+        unsigned long   node_id       : 15;  /* RW */
+        unsigned long   rsvd_47       :  1;  /*    */
+        unsigned long   nodes_per_bit :  7;  /* RW */
+        unsigned long   rsvd_55       :  1;  /*    */
+        unsigned long   ni_port       :  4;  /* RO */
+        unsigned long   rsvd_60_63    :  4;  /*    */
+    } s;
+};
+
+/* ========================================================================= */
+/*                UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR                  */
+/* ========================================================================= */
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR 0x16000d0UL
+
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT 24
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+
+union uvh_rh_gam_alias210_redirect_config_0_mmr_u {
+    unsigned long       v;
+    struct uvh_rh_gam_alias210_redirect_config_0_mmr_s {
+        unsigned long   rsvd_0_23 : 24;  /*    */
+        unsigned long   dest_base : 22;  /* RW */
+        unsigned long   rsvd_46_63: 18;  /*    */
+    } s;
+};
+
+/* ========================================================================= */
+/*                UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR                  */
+/* ========================================================================= */
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR 0x16000e0UL
+
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_SHFT 24
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+
+union uvh_rh_gam_alias210_redirect_config_1_mmr_u {
+    unsigned long       v;
+    struct uvh_rh_gam_alias210_redirect_config_1_mmr_s {
+        unsigned long   rsvd_0_23 : 24;  /*    */
+        unsigned long   dest_base : 22;  /* RW */
+        unsigned long   rsvd_46_63: 18;  /*    */
+    } s;
+};
+
+/* ========================================================================= */
+/*                UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR                  */
+/* ========================================================================= */
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR 0x16000f0UL
+
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_SHFT 24
+#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+
+union uvh_rh_gam_alias210_redirect_config_2_mmr_u {
+    unsigned long       v;
+    struct uvh_rh_gam_alias210_redirect_config_2_mmr_s {
+        unsigned long   rsvd_0_23 : 24;  /*    */
+        unsigned long   dest_base : 22;  /* RW */
+        unsigned long   rsvd_46_63: 18;  /*    */
+    } s;
+};
+
+/* ========================================================================= */
+/*                    UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR                      */
+/* ========================================================================= */
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR 0x1600010UL
+
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_SHFT 46
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_MASK 0x0000400000000000UL
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+union uvh_rh_gam_gru_overlay_config_mmr_u {
+    unsigned long       v;
+    struct uvh_rh_gam_gru_overlay_config_mmr_s {
+        unsigned long   rsvd_0_27: 28;  /*    */
+        unsigned long   base   : 18;  /* RW */
+        unsigned long   gr4    :  1;  /* RW */
+        unsigned long   rsvd_47_51:  5;  /*    */
+        unsigned long   n_gru  :  4;  /* RW */
+        unsigned long   rsvd_56_62:  7;  /*    */
+        unsigned long   enable :  1;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                    UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR                      */
+/* ========================================================================= */
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR 0x1600028UL
+
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_SHFT 46
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_MASK 0x0000400000000000UL
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+union uvh_rh_gam_mmr_overlay_config_mmr_u {
+    unsigned long       v;
+    struct uvh_rh_gam_mmr_overlay_config_mmr_s {
+        unsigned long   rsvd_0_25: 26;  /*    */
+        unsigned long   base     : 20;  /* RW */
+        unsigned long   dual_hub :  1;  /* RW */
+        unsigned long   rsvd_47_62: 16;  /*    */
+        unsigned long   enable   :  1;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                                 UVH_RTC                                   */
+/* ========================================================================= */
+#define UVH_RTC 0x28000UL
+
+#define UVH_RTC_REAL_TIME_CLOCK_SHFT 0
+#define UVH_RTC_REAL_TIME_CLOCK_MASK 0x00ffffffffffffffUL
+
+union uvh_rtc_u {
+    unsigned long       v;
+    struct uvh_rtc_s {
+        unsigned long   real_time_clock : 56;  /* RW */
+        unsigned long   rsvd_56_63      :  8;  /*    */
+    } s;
+};
+
+/* ========================================================================= */
+/*                          UVH_SI_ADDR_MAP_CONFIG                           */
+/* ========================================================================= */
+#define UVH_SI_ADDR_MAP_CONFIG 0xc80000UL
+
+#define UVH_SI_ADDR_MAP_CONFIG_M_SKT_SHFT 0
+#define UVH_SI_ADDR_MAP_CONFIG_M_SKT_MASK 0x000000000000003fUL
+#define UVH_SI_ADDR_MAP_CONFIG_N_SKT_SHFT 8
+#define UVH_SI_ADDR_MAP_CONFIG_N_SKT_MASK 0x0000000000000f00UL
+
+union uvh_si_addr_map_config_u {
+    unsigned long       v;
+    struct uvh_si_addr_map_config_s {
+        unsigned long   m_skt :  6;  /* RW */
+        unsigned long   rsvd_6_7:  2;  /*    */
+        unsigned long   n_skt :  4;  /* RW */
+        unsigned long   rsvd_12_63: 52;  /*    */
+    } s;
+};
+
+/* ========================================================================= */
+/*                       UVH_SI_ALIAS0_OVERLAY_CONFIG                        */
+/* ========================================================================= */
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG 0xc80008UL
+
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG_BASE_SHFT 24
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG_BASE_MASK 0x00000000ff000000UL
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG_M_ALIAS_SHFT 48
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG_M_ALIAS_MASK 0x001f000000000000UL
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG_ENABLE_SHFT 63
+#define UVH_SI_ALIAS0_OVERLAY_CONFIG_ENABLE_MASK 0x8000000000000000UL
+
+union uvh_si_alias0_overlay_config_u {
+    unsigned long       v;
+    struct uvh_si_alias0_overlay_config_s {
+        unsigned long   rsvd_0_23: 24;  /*    */
+        unsigned long   base    :  8;  /* RW */
+        unsigned long   rsvd_32_47: 16;  /*    */
+        unsigned long   m_alias :  5;  /* RW */
+        unsigned long   rsvd_53_62: 10;  /*    */
+        unsigned long   enable  :  1;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                       UVH_SI_ALIAS1_OVERLAY_CONFIG                        */
+/* ========================================================================= */
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG 0xc80010UL
+
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG_BASE_SHFT 24
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG_BASE_MASK 0x00000000ff000000UL
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG_M_ALIAS_SHFT 48
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG_M_ALIAS_MASK 0x001f000000000000UL
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG_ENABLE_SHFT 63
+#define UVH_SI_ALIAS1_OVERLAY_CONFIG_ENABLE_MASK 0x8000000000000000UL
+
+union uvh_si_alias1_overlay_config_u {
+    unsigned long       v;
+    struct uvh_si_alias1_overlay_config_s {
+        unsigned long   rsvd_0_23: 24;  /*    */
+        unsigned long   base    :  8;  /* RW */
+        unsigned long   rsvd_32_47: 16;  /*    */
+        unsigned long   m_alias :  5;  /* RW */
+        unsigned long   rsvd_53_62: 10;  /*    */
+        unsigned long   enable  :  1;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                       UVH_SI_ALIAS2_OVERLAY_CONFIG                        */
+/* ========================================================================= */
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG 0xc80018UL
+
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG_BASE_SHFT 24
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG_BASE_MASK 0x00000000ff000000UL
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG_M_ALIAS_SHFT 48
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG_M_ALIAS_MASK 0x001f000000000000UL
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG_ENABLE_SHFT 63
+#define UVH_SI_ALIAS2_OVERLAY_CONFIG_ENABLE_MASK 0x8000000000000000UL
+
+union uvh_si_alias2_overlay_config_u {
+    unsigned long       v;
+    struct uvh_si_alias2_overlay_config_s {
+        unsigned long   rsvd_0_23: 24;  /*    */
+        unsigned long   base    :  8;  /* RW */
+        unsigned long   rsvd_32_47: 16;  /*    */
+        unsigned long   m_alias :  5;  /* RW */
+        unsigned long   rsvd_53_62: 10;  /*    */
+        unsigned long   enable  :  1;  /* RW */
+    } s;
+};
+
+
+#endif /* __ASM_IA64_UV_MMRS__ */
diff --git a/include/asm-parisc/assembly.h b/include/asm-parisc/assembly.h
index 5587f0023881..ffb208840ecc 100644
--- a/include/asm-parisc/assembly.h
+++ b/include/asm-parisc/assembly.h
@@ -31,9 +31,8 @@
 #define STREGM  std,ma
 #define SHRREG  shrd
 #define SHLREG  shld
-#define ADDIB   addib,*
-#define CMPB    cmpb,*
 #define ANDCM   andcm,*
+#define COND(x) * ## x
 #define RP_OFFSET       16
 #define FRAME_SIZE      128
 #define CALLEE_REG_FRAME_SIZE   144
@@ -46,9 +45,8 @@
 #define STREGM  stwm
 #define SHRREG  shr
 #define SHLREG  shlw
-#define ADDIB   addib,
-#define CMPB    cmpb,
 #define ANDCM   andcm
+#define COND(x) x
 #define RP_OFFSET       20
 #define FRAME_SIZE      64
 #define CALLEE_REG_FRAME_SIZE   128
diff --git a/include/asm-parisc/ioctl.h b/include/asm-parisc/ioctl.h
index 68338d2bda4e..ec8efa02beda 100644
--- a/include/asm-parisc/ioctl.h
+++ b/include/asm-parisc/ioctl.h
@@ -32,21 +32,6 @@
  * NOTE: This limits the max parameter size to 16kB -1 !
  */
 
-#define _IOC_NRBITS     8
-#define _IOC_TYPEBITS   8
-#define _IOC_SIZEBITS   14
-#define _IOC_DIRBITS    2
-
-#define _IOC_NRMASK     ((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK   ((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK   ((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK    ((1 << _IOC_DIRBITS)-1)
-
-#define _IOC_NRSHIFT    0
-#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
 /*
  * Direction bits.
  */
@@ -54,40 +39,6 @@
 #define _IOC_WRITE      2U
 #define _IOC_READ       1U
 
-#define _IOC(dir,type,nr,size) \
-        (((dir)  << _IOC_DIRSHIFT) | \
-         ((type) << _IOC_TYPESHIFT) | \
-         ((nr)   << _IOC_NRSHIFT) | \
-         ((size) << _IOC_SIZESHIFT))
-
-/* provoke compile error for invalid uses of size argument */
-extern unsigned int __invalid_size_argument_for_IOC;
-#define _IOC_TYPECHECK(t) \
-        ((sizeof(t) == sizeof(t[1]) && \
-          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
-          sizeof(t) : __invalid_size_argument_for_IOC)
-
-/* used to create numbers */
-#define _IO(type,nr)            _IOC(_IOC_NONE,(type),(nr),0)
-#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOW(type,nr,size)      _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOWR(type,nr,size)     _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOR_BAD(type,nr,size)  _IOC(_IOC_READ,(type),(nr),sizeof(size))
-#define _IOW_BAD(type,nr,size)  _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-
-/* used to decode ioctl numbers.. */
-#define _IOC_DIR(nr)            (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-#define _IOC_TYPE(nr)           (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-#define _IOC_NR(nr)             (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-#define _IOC_SIZE(nr)           (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-
-/* ...and for the drivers/sound files... */
-
-#define IOC_IN          (_IOC_WRITE << _IOC_DIRSHIFT)
-#define IOC_OUT         (_IOC_READ << _IOC_DIRSHIFT)
-#define IOC_INOUT       ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-#define IOCSIZE_MASK    (_IOC_SIZEMASK << _IOC_SIZESHIFT)
-#define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
+#include <asm-generic/ioctl.h>
 
 #endif /* _ASM_PARISC_IOCTL_H */
diff --git a/include/asm-parisc/ioctls.h b/include/asm-parisc/ioctls.h
index ee84e4172c36..6747fad07a3e 100644
--- a/include/asm-parisc/ioctls.h
+++ b/include/asm-parisc/ioctls.h
@@ -46,6 +46,10 @@
 #define TIOCSBRK        0x5427  /* BSD compatibility */
 #define TIOCCBRK        0x5428  /* BSD compatibility */
 #define TIOCGSID        _IOR('T', 20, int) /* Return the session ID of FD */
+#define TCGETS2         _IOR('T',0x2A, struct termios2)
+#define TCSETS2         _IOW('T',0x2B, struct termios2)
+#define TCSETSW2        _IOW('T',0x2C, struct termios2)
+#define TCSETSF2        _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/include/asm-parisc/termbits.h b/include/asm-parisc/termbits.h
index e847fe979684..d8bbc73b16b7 100644
--- a/include/asm-parisc/termbits.h
+++ b/include/asm-parisc/termbits.h
@@ -141,6 +141,7 @@ struct ktermios {
 #define HUPCL   0002000
 #define CLOCAL  0004000
 #define CBAUDEX 0010000
+#define    BOTHER 0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -156,10 +157,12 @@ struct ktermios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate (not used) */
+#define CIBAUD    002003600000          /* input baud rate */
 #define CMSPAR    010000000000          /* mark or space (stick) parity */
 #define CRTSCTS   020000000000          /* flow control */
 
+#define IBSHIFT 16              /* Shift from CBAUD to CIBAUD */
+
 
 /* c_lflag bits */
 #define ISIG    0000001
diff --git a/include/asm-parisc/termios.h b/include/asm-parisc/termios.h
index 5345b3420475..a2a57a4548af 100644
--- a/include/asm-parisc/termios.h
+++ b/include/asm-parisc/termios.h
@@ -80,8 +80,10 @@ struct termio {
         copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
 })
 
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
+#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
+#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
+#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
 
 #endif  /* __KERNEL__ */
 
diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h
index 335baf4fc64f..9450ce6e32de 100644
--- a/include/asm-s390/debug.h
+++ b/include/asm-s390/debug.h
@@ -120,10 +120,10 @@ debug_entry_t* debug_exception_common(debug_info_t* id, int level,
 
 /* Debug Feature API: */
 
-debug_info_t* debug_register(char* name, int pages, int nr_areas,
+debug_info_t *debug_register(const char *name, int pages, int nr_areas,
                              int buf_size);
 
-debug_info_t *debug_register_mode(char *name, int pages, int nr_areas,
+debug_info_t *debug_register_mode(const char *name, int pages, int nr_areas,
                                   int buf_size, mode_t mode, uid_t uid,
                                   gid_t gid);
 
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 82de2fb62cb7..00c1801099fa 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -83,16 +83,6 @@ __attribute__((format(printf,1,2)));
 static inline void __check_printsym_format(const char *fmt, ...)
 {
 }
-/* ia64 and ppc64 use function descriptors, which contain the real address */
-#if defined(CONFIG_IA64) || defined(CONFIG_PPC64)
-#define print_fn_descriptor_symbol(fmt, addr)           \
-do {                                            \
-        unsigned long *__faddr = (unsigned long*) addr;         \
-        print_symbol(fmt, __faddr[0]);          \
-} while (0)
-#else
-#define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
-#endif
 
 static inline void print_symbol(const char *fmt, unsigned long addr)
 {
@@ -101,6 +91,20 @@ static inline void print_symbol(const char *fmt, unsigned long addr)
                        __builtin_extract_return_addr((void *)addr));
 }
 
+/*
+ * Pretty-print a function pointer.
+ *
+ * ia64 and ppc64 function pointers are really function descriptors,
+ * which contain a pointer the real address.
+ */
+static inline void print_fn_descriptor_symbol(const char *fmt, void *addr)
+{
+#if defined(CONFIG_IA64) || defined(CONFIG_PPC64)
+        addr = *(void **)addr;
+#endif
+        print_symbol(fmt, (unsigned long)addr);
+}
+
 #ifndef CONFIG_64BIT
 #define print_ip_sym(ip)                \
 do {                                    \
diff --git a/init/main.c b/init/main.c
index f406fefa626c..f7fb20021d48 100644
--- a/init/main.c
+++ b/init/main.c
@@ -693,55 +693,57 @@ static int __init initcall_debug_setup(char *str)
 }
 __setup("initcall_debug", initcall_debug_setup);
 
-extern initcall_t __initcall_start[], __initcall_end[];
-
-static void __init do_initcalls(void)
+static void __init do_one_initcall(initcall_t fn)
 {
-        initcall_t *call;
         int count = preempt_count();
+        ktime_t t0, t1, delta;
+        char msgbuf[64];
+        int result;
 
-        for (call = __initcall_start; call < __initcall_end; call++) {
-                ktime_t t0, t1, delta;
-                char msgbuf[40];
-                int result;
-
-                if (initcall_debug) {
-                        print_fn_descriptor_symbol("calling  %s()\n",
-                                        (unsigned long) *call);
-                        t0 = ktime_get();
-                }
+        if (initcall_debug) {
+                print_fn_descriptor_symbol("calling  %s\n", fn);
+                t0 = ktime_get();
+        }
 
-                result = (*call)();
+        result = fn();
 
-                if (initcall_debug) {
-                        t1 = ktime_get();
-                        delta = ktime_sub(t1, t0);
+        if (initcall_debug) {
+                t1 = ktime_get();
+                delta = ktime_sub(t1, t0);
 
-                        print_fn_descriptor_symbol("initcall %s()",
-                                        (unsigned long) *call);
-                        printk(" returned %d after %Ld msecs\n", result,
-                                (unsigned long long) delta.tv64 >> 20);
-                }
+                print_fn_descriptor_symbol("initcall %s", fn);
+                printk(" returned %d after %Ld msecs\n", result,
+                        (unsigned long long) delta.tv64 >> 20);
+        }
 
-                msgbuf[0] = 0;
+        msgbuf[0] = 0;
 
-                if (result && result != -ENODEV && initcall_debug)
-                        sprintf(msgbuf, "error code %d ", result);
+        if (result && result != -ENODEV && initcall_debug)
+                sprintf(msgbuf, "error code %d ", result);
 
-                if (preempt_count() != count) {
-                        strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
-                        preempt_count() = count;
-                }
-                if (irqs_disabled()) {
-                        strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
-                        local_irq_enable();
-                }
-                if (msgbuf[0]) {
-                        print_fn_descriptor_symbol(KERN_WARNING "initcall %s()",
-                                        (unsigned long) *call);
-                        printk(" returned with %s\n", msgbuf);
-                }
+        if (preempt_count() != count) {
+                strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+                preempt_count() = count;
         }
+        if (irqs_disabled()) {
+                strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
+                local_irq_enable();
+        }
+        if (msgbuf[0]) {
+                print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn);
+                printk(" returned with %s\n", msgbuf);
+        }
+}
+
+
+extern initcall_t __initcall_start[], __initcall_end[];
+
+static void __init do_initcalls(void)
+{
+        initcall_t *call;
+
+        for (call = __initcall_start; call < __initcall_end; call++)
+                do_one_initcall(*call);
 
         /* Make sure there is no pending stuff from the initcall sequence */
         flush_scheduled_work();