From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 20 Oct 2008 02:17:52 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: firefly_0821_release~17207^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4cb40f795af36b3deb743f6ccf6c3fd542c61c8d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

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

4cb40f795af36b3deb743f6ccf6c3fd542c61c8d
diff --cc Documentation/kernel-parameters.txt
index abeff96e9d46,d4f4875fc7c6..bcecfaa1e770
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -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
diff --cc arch/sh/include/asm/elf.h
index 4da3a0b10911,ee02db110f0d..f7d0b8e6aa84
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@@ -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
diff --cc arch/sh/kernel/smp.c
index c55d314166c7,001778f9adaf..508dfb023628
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@@ -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);