Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a6d5a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Update mach-types
  ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT
  MAINTAINERS: add maintainer information for AMBA primecell drivers
  [ARM] pxa/spitz: fix compile regression on spitz
  ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
  [ARM] pxa/cpufreq: fix index assignments for end marker
  ARM: PNX4008: fix watchdog device driver name
  [ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
parents b4297b01 3fcca9ac

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -512,10 +512,32 @@ W: http://www.arm.linux.org.uk/ 
S:	Maintained

F:	arch/arm/



ARM PRIMECELL AACI PL041 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

S:	Maintained

F:	sound/arm/aaci.*



ARM PRIMECELL CLCD PL110 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

S:	Maintained

F:	drivers/video/amba-clcd.*



ARM PRIMECELL KMI PL050 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

S:	Maintained

F:	drivers/input/serio/ambakmi.*

F:	include/linux/amba/kmi.h



ARM PRIMECELL MMCI PL180/1 DRIVER

S:	Orphan

F:	drivers/mmc/host/mmci.*



ARM PRIMECELL BUS SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

S:	Maintained

F:	drivers/amba/

F:	include/linux/amba/bus.h



ARM/ADI ROADRUNNER MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/include/asm/kmap_types.h

+6 −0
Original line number Diff line number Diff line
@@ -22,4 +22,10 @@ enum km_type { 
	KM_TYPE_NR

};



#ifdef CONFIG_DEBUG_HIGHMEM

#define KM_NMI		(-1)

#define KM_NMI_PTE	(-1)

#define KM_IRQ_PTE	(-1)

#endif



#endif

arch/arm/kernel/signal.c

+6 −2
Original line number Diff line number Diff line
@@ -662,8 +662,12 @@ static void do_signal(struct pt_regs *regs, int syscall) 
				regs->ARM_sp -= 4;

				usp = (u32 __user *)regs->ARM_sp;



				put_user(regs->ARM_pc, usp);

				if (put_user(regs->ARM_pc, usp) == 0) {

					regs->ARM_pc = KERN_RESTART_CODE;

				} else {

					regs->ARM_sp += 4;

					force_sigsegv(0, current);

				}

#endif

			}

		}

arch/arm/mach-pxa/cpufreq-pxa2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy) 
		pxa27x_freq_table[i].frequency = freq;

		pxa27x_freq_table[i].index = i;

	}

	pxa27x_freq_table[i].index = i;

	pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;



	/*

arch/arm/mach-pxa/cpufreq-pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy, 
		table[i].index = i;

		table[i].frequency = freqs[i].cpufreq_mhz * 1000;

	}

	table[num].frequency = i;

	table[num].index = i;

	table[num].frequency = CPUFREQ_TABLE_END;



	pxa3xx_freqs = freqs;