Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Mon, 20 Oct 2008 02:17:52 +0000 (11:17 +0900)]
Conflicts:

Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h

1  2 
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
arch/sh/kernel/smp.c
drivers/net/sh_eth.c
drivers/rtc/rtc-sh.c

@@@ -796,8 -796,7 +796,9 @@@ and is between 256 and 4096 characters
                        Defaults to the default architecture's huge page size
                        if not specified.
  
 +      hlt             [BUGS=ARM,SH]
 +
+       i8042.debug     [HW] Toggle i8042 debug mode
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from
                             keyboard and cannot control its state
@@@ -197,8 -189,14 +197,6 @@@ do {                                                                      
  } while (0)
  #endif
  
- #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
 -#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
 -struct task_struct;
 -extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
 -extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
 -
 -#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
 -#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
 -
  #ifdef CONFIG_VSYSCALL
  /* vDSO has arch_setup_additional_pages */
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
@@@ -82,14 -82,13 +82,16 @@@ asmlinkage void __cpuinit start_seconda
  
        preempt_disable();
  
+       notify_cpu_starting(smp_processor_id());
        local_irq_enable();
  
 +      cpu = smp_processor_id();
 +
 +      /* Enable local timers */
 +      local_timer_setup(cpu);
        calibrate_delay();
  
 -      cpu = smp_processor_id();
        smp_store_cpu_info(cpu);
  
        cpu_set(cpu, cpu_online_map);
Simple merge
Simple merge