Commit b9afa3e0 authored by Paul Mundt's avatar Paul Mundt
Browse files

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



Conflicts:
	arch/sh/kernel/process_32.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 144c7494 763008c4

Documentation/laptops/thinkpad-acpi.txt

+4 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,10 @@ ThinkPad-specific interface. The driver will disable its native 
backlight brightness control interface if it detects that the standard

ACPI interface is available in the ThinkPad.



If you want to use the thinkpad-acpi backlight brightness control

instead of the generic ACPI video backlight brightness control for some

reason, you should use the acpi_backlight=vendor kernel parameter.



The brightness_enable module parameter can be used to control whether

the LCD brightness control feature will be enabled when available.

brightness_enable=0 forces it to be disabled.  brightness_enable=1

Documentation/powerpc/booting-without-of.txt

+2 −29
Original line number Diff line number Diff line
@@ -49,40 +49,13 @@ Table of Contents 
      f) MDIO on GPIOs

      g) SPI busses



  VII - Marvell Discovery mv64[345]6x System Controller chips

    1) The /system-controller node

    2) Child nodes of /system-controller

      a) Marvell Discovery MDIO bus

      b) Marvell Discovery ethernet controller

      c) Marvell Discovery PHY nodes

      d) Marvell Discovery SDMA nodes

      e) Marvell Discovery BRG nodes

      f) Marvell Discovery CUNIT nodes

      g) Marvell Discovery MPSCROUTING nodes

      h) Marvell Discovery MPSCINTR nodes

      i) Marvell Discovery MPSC nodes

      j) Marvell Discovery Watch Dog Timer nodes

      k) Marvell Discovery I2C nodes

      l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes

      m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes

      n) Marvell Discovery GPP (General Purpose Pins) nodes

      o) Marvell Discovery PCI host bridge node

      p) Marvell Discovery CPU Error nodes

      q) Marvell Discovery SRAM Controller nodes

      r) Marvell Discovery PCI Error Handler nodes

      s) Marvell Discovery Memory Controller nodes



  VIII - Specifying interrupt information for devices

  VII - Specifying interrupt information for devices

    1) interrupts property

    2) interrupt-parent property

    3) OpenPIC Interrupt Controllers

    4) ISA Interrupt Controllers



  IX - Specifying GPIO information for devices

    1) gpios property

    2) gpio-controller nodes



  X - Specifying device power management information (sleep property)

  VIII - Specifying device power management information (sleep property)



  Appendix A - Sample SOC node for MPC8540

arch/alpha/kernel/process.c

+3 −2
Original line number Diff line number Diff line
@@ -387,8 +387,9 @@ EXPORT_SYMBOL(dump_elf_task_fp); 
 * sys_execve() executes a new program.

 */

asmlinkage int

do_sys_execve(const char __user *ufilename, char __user * __user *argv,

	      char __user * __user *envp, struct pt_regs *regs)

do_sys_execve(const char __user *ufilename,

	      const char __user *const __user *argv,

	      const char __user *const __user *envp, struct pt_regs *regs)

{

	int error;

	char *filename;

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ GZFLAGS :=-9 
# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:

KBUILD_CFLAGS	+=$(call cc-option,-marm,)



# Never generate .eh_frame

KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)



# Do not use arch/arm/defconfig - it's always outdated.

# Select a platform tht is kept up-to-date

KBUILD_DEFCONFIG := versatile_defconfig

arch/arm/include/asm/ptrace.h

+13 −4
Original line number Diff line number Diff line
@@ -158,15 +158,24 @@ struct pt_regs { 
 */

static inline int valid_user_regs(struct pt_regs *regs)

{

	if (user_mode(regs) && (regs->ARM_cpsr & PSR_I_BIT) == 0) {

	unsigned long mode = regs->ARM_cpsr & MODE_MASK;



	/*

	 * Always clear the F (FIQ) and A (delayed abort) bits

	 */

	regs->ARM_cpsr &= ~(PSR_F_BIT | PSR_A_BIT);



	if ((regs->ARM_cpsr & PSR_I_BIT) == 0) {

		if (mode == USR_MODE)

			return 1;

		if (elf_hwcap & HWCAP_26BIT && mode == USR26_MODE)

			return 1;

	}



	/*

	 * Force CPSR to something logical...

	 */

	regs->ARM_cpsr &= PSR_f | PSR_s | (PSR_x & ~PSR_A_BIT) | PSR_T_BIT | MODE32_BIT;

	regs->ARM_cpsr &= PSR_f | PSR_s | PSR_x | PSR_T_BIT | MODE32_BIT;

	if (!(elf_hwcap & HWCAP_26BIT))

		regs->ARM_cpsr |= USR_MODE;