5 files changed, 157 insertions, 243 deletions

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index 2f283b2fb164..63104ebd1806 100644
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -12,73 +12,22 @@ NM := $(NM) -B
 
 LDFLAGS_vmlinux := -static -N #-relax
 CHECKFLAGS      += -D__alpha__ -m64
-cflags-y        := -pipe -mno-fp-regs -ffixed-8
-
-# Determine if we can use the BWX instructions with GAS.
-old_gas := $(shell if $(AS) --version 2>&1 | grep 'version 2.7' > /dev/null; then echo y; else echo n; fi)
-
-ifeq ($(old_gas),y)
-$(error The assembler '$(AS)' does not support the BWX instruction)
-endif
-
-# Determine if GCC understands the -mcpu= option.
-have_mcpu        := $(call cc-option-yn, -mcpu=ev5)
-have_mcpu_pca56  := $(call cc-option-yn, -mcpu=pca56)
-have_mcpu_ev6    := $(call cc-option-yn, -mcpu=ev6)
-have_mcpu_ev67   := $(call cc-option-yn, -mcpu=ev67)
-have_msmall_data := $(call cc-option-yn, -msmall-data)
-
-cflags-$(have_msmall_data) += -msmall-data
-
-# Turn on the proper cpu optimizations.
-ifeq ($(have_mcpu),y)
-  mcpu_done := n
-  # If GENERIC, make sure to turn off any instruction set extensions that
-  # the host compiler might have on by default.  Given that EV4 and EV5
-  # have the same instruction set, prefer EV5 because an EV5 schedule is
-  # more likely to keep an EV4 processor busy than vice-versa.
-  ifeq ($(CONFIG_ALPHA_GENERIC),y)
-    mcpu := ev5
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_SX164)$(have_mcpu_pca56),nyy)
-    mcpu := pca56
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_POLARIS)$(have_mcpu_pca56),nyy)
-    mcpu := pca56
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_EV4),ny)
-    mcpu := ev4
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_EV56),ny)
-    mcpu := ev56
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_EV5),ny)
-    mcpu := ev5
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_EV67)$(have_mcpu_ev67),nyy)
-    mcpu := ev67
-    mcpu_done := y
-  endif
-  ifeq ($(mcpu_done)$(CONFIG_ALPHA_EV6),ny)
-    ifeq ($(have_mcpu_ev6),y)
-      mcpu := ev6
-    else
-      ifeq ($(have_mcpu_pca56),y)
-        mcpu := pca56
-      else
-        mcpu=ev56
-      endif
-    endif
-    mcpu_done := y
-  endif
-  cflags-$(mcpu_done) += -mcpu=$(mcpu)
-endif
+cflags-y        := -pipe -mno-fp-regs -ffixed-8 -msmall-data
+
+cpuflags-$(CONFIG_ALPHA_EV67)           := -mcpu=ev67
+cpuflags-$(CONFIG_ALPHA_EV6)            := -mcpu=ev6
+cpuflags-$(CONFIG_ALPHA_POLARIS)        := -mcpu=pca56
+cpuflags-$(CONFIG_ALPHA_SX164)          := -mcpu=pca56
+cpuflags-$(CONFIG_ALPHA_EV56)           := -mcpu=ev56
+cpuflags-$(CONFIG_ALPHA_EV5)            := -mcpu=ev5
+cpuflags-$(CONFIG_ALPHA_EV4)            := -mcpu=ev4
+# If GENERIC, make sure to turn off any instruction set extensions that
+# the host compiler might have on by default.  Given that EV4 and EV5
+# have the same instruction set, prefer EV5 because an EV5 schedule is
+# more likely to keep an EV4 processor busy than vice-versa.
+cpuflags-$(CONFIG_ALPHA_GENERIC)        := -mcpu=ev5
+
+cflags-y                                += $(cpuflags-y)
 
 
 # For TSUNAMI, we must have the assembler not emulate our instructions.
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index debc8f03886c..5fc61e281ac7 100644
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -917,15 +917,6 @@ sys_pipe:
 .end sys_pipe
 
         .align  4
-        .globl  sys_ptrace
-        .ent    sys_ptrace
-sys_ptrace:
-        .prologue 0
-        mov     $sp, $20
-        jmp     $31, do_sys_ptrace
-.end sys_ptrace
-
-        .align  4
         .globl  sys_execve
         .ent    sys_execve
 sys_execve:
diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
index 83a781842266..1e9ad52c460e 100644
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
@@ -260,38 +260,12 @@ void ptrace_disable(struct task_struct *child)
         ptrace_cancel_bpt(child);
 }
 
-asmlinkage long
-do_sys_ptrace(long request, long pid, long addr, long data,
-              struct pt_regs *regs)
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-        struct task_struct *child;
         unsigned long tmp;
         size_t copied;
         long ret;
 
-        lock_kernel();
-        DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n",
-                      request, pid, addr, data));
-        if (request == PTRACE_TRACEME) {
-                ret = ptrace_traceme();
-                goto out_notsk;
-        }
-
-        child = ptrace_get_task_struct(pid);
-        if (IS_ERR(child)) {
-                ret = PTR_ERR(child);
-                goto out_notsk;
-        }
-
-        if (request == PTRACE_ATTACH) {
-                ret = ptrace_attach(child);
-                goto out;
-        }
-
-        ret = ptrace_check_attach(child, request == PTRACE_KILL);
-        if (ret < 0)
-                goto out;
-
         switch (request) {
         /* When I and D space are separate, these will need to be fixed.  */
         case PTRACE_PEEKTEXT: /* read word at location addr. */
@@ -301,13 +275,13 @@ do_sys_ptrace(long request, long pid, long addr, long data,
                 if (copied != sizeof(tmp))
                         break;
                 
-                regs->r0 = 0;   /* special return: no errors */
+                force_successful_syscall_return();
                 ret = tmp;
                 break;
 
         /* Read register number ADDR. */
         case PTRACE_PEEKUSR:
-                regs->r0 = 0;   /* special return: no errors */
+                force_successful_syscall_return();
                 ret = get_reg(child, addr);
                 DBG(DBG_MEM, ("peek $%ld->%#lx\n", addr, ret));
                 break;
@@ -353,7 +327,7 @@ do_sys_ptrace(long request, long pid, long addr, long data,
                 /* make sure single-step breakpoint is gone. */
                 ptrace_cancel_bpt(child);
                 wake_up_process(child);
-                goto out;
+                break;
 
         case PTRACE_SINGLESTEP:  /* execute single instruction. */
                 ret = -EIO;
@@ -366,20 +340,12 @@ do_sys_ptrace(long request, long pid, long addr, long data,
                 wake_up_process(child);
                 /* give it a chance to run. */
                 ret = 0;
-                goto out;
-
-        case PTRACE_DETACH:      /* detach a process that was attached. */
-                ret = ptrace_detach(child, data);
-                goto out;
+                break;
 
         default:
                 ret = ptrace_request(child, request, addr, data);
-                goto out;
+                break;
         }
- out:
-        put_task_struct(child);
- out_notsk:
-        unlock_kernel();
         return ret;
 }
 
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 7af07d3ad5f0..55c05b511f4c 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,4 +1,5 @@
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf64-alpha")
 OUTPUT_ARCH(alpha)
@@ -8,138 +9,145 @@ jiffies = jiffies_64;
 SECTIONS
 {
 #ifdef CONFIG_ALPHA_LEGACY_START_ADDRESS
-  . = 0xfffffc0000310000;
+        . = 0xfffffc0000310000;
 #else
-  . = 0xfffffc0001010000;
+        . = 0xfffffc0001010000;
 #endif
 
-  _text = .;                                    /* Text and read-only data */
-  .text : { 
+        _text = .;      /* Text and read-only data */
+        .text : {
         *(.text.head)
-        TEXT_TEXT
-        SCHED_TEXT
-        LOCK_TEXT
-        *(.fixup)
-        *(.gnu.warning)
-  } :kernel
-  _etext = .;                                   /* End of text section */
-
-  . = ALIGN(16);
-  __start___ex_table = .;                       /* Exception table */
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  NOTES :kernel :note
-  .dummy : { *(.dummy) } :kernel
-
-  RODATA
-
-  /* Will be freed after init */
-  . = ALIGN(8192);                              /* Init code and data */
-  __init_begin = .;
-  .init.text : { 
-        _sinittext = .;
-        *(.init.text)
-        _einittext = .;
-  }
-  .init.data : { *(.init.data) }
-
-  . = ALIGN(16);
-  __setup_start = .;
-  .init.setup : { *(.init.setup) }
-  __setup_end = .;
-
-  . = ALIGN(8);
-  __initcall_start = .;
-  .initcall.init : {
-        INITCALLS
-  }
-  __initcall_end = .;
+                TEXT_TEXT
+                SCHED_TEXT
+                LOCK_TEXT
+                *(.fixup)
+                *(.gnu.warning)
+        } :kernel
+        _etext = .;     /* End of text section */
+
+        /* Exception table */
+        . = ALIGN(16);
+        __ex_table : {
+                __start___ex_table = .;
+                *(__ex_table)
+                __stop___ex_table = .;
+        }
+
+        NOTES :kernel :note
+        .dummy : {
+                *(.dummy)
+        } :kernel
+
+        RODATA
+
+        /* Will be freed after init */
+        . = ALIGN(PAGE_SIZE);
+        /* Init code and data */
+        __init_begin = .;
+        .init.text : {
+                _sinittext = .;
+                *(.init.text)
+                _einittext = .;
+        }
+        .init.data : {
+                *(.init.data)
+        }
+
+        . = ALIGN(16);
+        .init.setup : {
+                __setup_start = .;
+                *(.init.setup)
+                __setup_end = .;
+        }
+
+        . = ALIGN(8);
+        .initcall.init : {
+                __initcall_start = .;
+                INITCALLS
+                __initcall_end = .;
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(8192);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.ramfs) }
-  __initramfs_end = .;
+        . = ALIGN(PAGE_SIZE);
+        .init.ramfs : {
+                __initramfs_start = .;
+                *(.init.ramfs)
+                __initramfs_end = .;
+        }
 #endif
 
-  . = ALIGN(8);
-  .con_initcall.init : {
-        __con_initcall_start = .;
-        *(.con_initcall.init)
-        __con_initcall_end = .;
-  }
-
-  . = ALIGN(8);
-  SECURITY_INIT
-
-  PERCPU(8192)
-
-  . = ALIGN(2*8192);
-  __init_end = .;
-  /* Freed after init ends here */
-
-  /* Note 2 page alignment above.  */
-  .data.init_thread : { *(.data.init_thread) }
-
-  . = ALIGN(8192);
-  .data.page_aligned : { *(.data.page_aligned) }
-
-  . = ALIGN(64);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
-  _data = .;
-  .data : {                                     /* Data */
-        DATA_DATA
-        CONSTRUCTORS
-  }
-
-  .got : { *(.got) }
-  .sdata : { *(.sdata) }
-
-  _edata = .;                                   /* End of data section */
-
-  __bss_start = .;
-  .sbss : { *(.sbss) *(.scommon) }
-  .bss : { *(.bss) *(COMMON) }
-  __bss_stop = .;
-
-  _end = .;
-
-  /* Sections to be discarded */
-  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
-
-  .mdebug 0 : { *(.mdebug) }
-  .note 0 : { *(.note) }
-  .comment 0 : { *(.comment) }
-
-  /* Stabs debugging sections */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
+        . = ALIGN(8);
+        .con_initcall.init : {
+                __con_initcall_start = .;
+                *(.con_initcall.init)
+                __con_initcall_end = .;
+        }
+
+        . = ALIGN(8);
+        SECURITY_INIT
+
+        PERCPU(PAGE_SIZE)
+
+        . = ALIGN(2 * PAGE_SIZE);
+        __init_end = .;
+        /* Freed after init ends here */
+
+        /* Note 2 page alignment above.  */
+        .data.init_thread : {
+                *(.data.init_thread)
+        }
+
+        . = ALIGN(PAGE_SIZE);
+        .data.page_aligned : {
+                *(.data.page_aligned)
+        }
+
+        . = ALIGN(64);
+        .data.cacheline_aligned : {
+                *(.data.cacheline_aligned)
+        }
+
+        _data = .;
+        /* Data */
+        .data : {
+                DATA_DATA
+                CONSTRUCTORS
+        }
+
+        .got : {
+                *(.got)
+        }
+        .sdata : {
+                *(.sdata)
+        }
+        _edata = .;     /* End of data section */
+
+        __bss_start = .;
+        .sbss : {
+                *(.sbss)
+                *(.scommon)
+        }
+        .bss : {
+                *(.bss)
+                *(COMMON)
+        }
+        __bss_stop = .;
+        _end = .;
+
+        /* Sections to be discarded */
+        /DISCARD/ : {
+                *(.exit.text)
+                *(.exit.data)
+                *(.exitcall.exit)
+        }
+
+        .mdebug 0 : {
+                *(.mdebug)
+        }
+        .note 0 : {
+                *(.note)
+        }
+
+        STABS_DEBUG
+        DWARF_DEBUG
 }
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index a0e18da594d9..25154df3055a 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -197,7 +197,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
                current->comm, current->pid);
         if (!user_mode(regs))
                 goto no_context;
-        do_exit(SIGKILL);
+        do_group_exit(SIGKILL);
 
  do_sigbus:
         /* Send a sigbus, regardless of whether we were in kernel