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

Commit c3a0bd75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (23 commits)
  ARM: Fix RiscPC decompressor build errors
  ARM: Fix sorting of platform group config options and includes
  ARM: 5991/1: Fix regression in restore_user_regs macro
  ARM: 5989/1: ARM: KGDB: add support for SMP platforms
  ARM: 5990/1: ARM: use __armv5tej_mmu_cache_flush for V5TEJ instead of __armv4_mmu_cache_flush
  ARM: Add final piece to fix XIP decompressor in read-only memory
  video: enable sh_mobile_lcdc on SH-Mobile ARM
  ARM: mach-shmobile: ap4evb SDHI0 platform data V2
  ARM: mach-shmobile: sh7372 SDHI vector merge
  ARM: mach-shmobile: sh7377 SDHI vector merge
  ARM: mach-shmobile: sh7367 SDHI vector merge
  ARM: mach-shmobile: G4EVM KEYSC platform data
  mtd: enable sh_flctl on SH-Mobile ARM
  ARM: mach-shmobile: G3EVM FLCTL platform data
  ARM: mach-shmobile: G3EVM KEYSC platform data
  Video: ARM CLCD: Better fix for swapped IENB and CNTL registers
  ARM: Add L2 cache handling to smp boot support
  ARM: 5960/1: ARM: perf-events: fix v7 event selection mask
  ARM: 5959/1: ARM: perf-events: request PMU interrupts with IRQF_NOBALANCING
  ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds
  ...
parents a41842f7 0d5e6f7a

arch/arm/Kconfig

+45 −36
Original line number Original line Diff line number Diff line
@@ -218,6 +218,10 @@ config MMU 
	  Select if you want MMU-based virtualised addressing space

	  Select if you want MMU-based virtualised addressing space

	  support by paged memory management. If unsure, say 'Y'.

	  support by paged memory management. If unsure, say 'Y'.





#

# The "ARM system type" choice list is ordered alphabetically by option

# text.  Please add new entries in the option alphabetic order.

#

choice

choice

	prompt "ARM system type"

	prompt "ARM system type"

	default ARCH_VERSATILE

	default ARCH_VERSATILE
@@ -274,6 +278,18 @@ config ARCH_AT91 
	  This enables support for systems based on the Atmel AT91RM9200,

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.

	  AT91SAM9 and AT91CAP9 processors.





config ARCH_BCMRING

	bool "Broadcom BCMRING"

	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Support for Broadcom's BCMRing platform.



config ARCH_CLPS711X

config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x-based"

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	select CPU_ARM720T
@@ -359,20 +375,6 @@ config ARCH_H720X 
	help

	help

	  This enables support for systems based on the Hynix HMS720x

	  This enables support for systems based on the Hynix HMS720x





config ARCH_NOMADIK

	bool "STMicroelectronics Nomadik"

	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson



config ARCH_IOP13XX

config ARCH_IOP13XX

	bool "IOP13xx-based"

	bool "IOP13xx-based"

	depends on MMU

	depends on MMU
@@ -747,6 +749,30 @@ config ARCH_U300 
	help

	help

	  Support for ST-Ericsson U300 series mobile platforms.

	  Support for ST-Ericsson U300 series mobile platforms.





config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	select CPU_V7

	select ARM_AMBA

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	help

	  Support for ST-Ericsson's Ux500 architecture



config ARCH_NOMADIK

	bool "STMicroelectronics Nomadik"

	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson



config ARCH_DAVINCI

config ARCH_DAVINCI

	bool "TI DaVinci"

	bool "TI DaVinci"

	select CPU_ARM926T

	select CPU_ARM926T
@@ -775,30 +801,13 @@ config ARCH_OMAP 
	help

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).

	  Support for TI's OMAP platform (OMAP1 and OMAP2).





config ARCH_BCMRING

	bool "Broadcom BCMRING"

	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Support for Broadcom's BCMRing platform.



config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	select CPU_V7

	select ARM_AMBA

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	help

	  Support for ST-Ericsson's Ux500 architecture



endchoice

endchoice





#

# This is sorted alphabetically by mach-* pathname.  However, plat-*

# Kconfigs may be included either alphabetically (according to the

# plat- suffix) or along side the corresponding mach-* source.

#

source "arch/arm/mach-aaec2000/Kconfig"

source "arch/arm/mach-aaec2000/Kconfig"





source "arch/arm/mach-at91/Kconfig"

source "arch/arm/mach-at91/Kconfig"

arch/arm/boot/compressed/decompress.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ extern unsigned long free_mem_end_ptr; 
extern void error(char *);

extern void error(char *);





#define STATIC static

#define STATIC static

#define STATIC_RW_DATA	/* non-static please */





#define ARCH_HAS_DECOMP_WDOG

#define ARCH_HAS_DECOMP_WDOG

arch/arm/boot/compressed/head.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -742,7 +742,7 @@ proc_types: 
		.word	0x000f0000

		.word	0x000f0000

		W(b)	__armv4_mmu_cache_on

		W(b)	__armv4_mmu_cache_on

		W(b)	__armv4_mmu_cache_off

		W(b)	__armv4_mmu_cache_off

		W(b)	__armv4_mmu_cache_flush

		W(b)	__armv5tej_mmu_cache_flush





		.word	0x0007b000		@ ARMv6

		.word	0x0007b000		@ ARMv6

		.word	0x000ff000

		.word	0x000ff000

arch/arm/boot/compressed/misc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ unsigned int __machine_arch_type; 
#else

#else





static void putstr(const char *ptr);

static void putstr(const char *ptr);

extern void error(char *x);





#include <mach/uncompress.h>

#include <mach/uncompress.h>

arch/arm/include/asm/elf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,7 @@ extern int elf_check_arch(const struct elf32_hdr *); 
extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);

extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);

#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(&(ex), stk)

#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(&(ex), stk)





struct task_struct;

int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);

int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);

#define ELF_CORE_COPY_TASK_REGS dump_task_regs

#define ELF_CORE_COPY_TASK_REGS dump_task_regs