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

Commit 1f0e14bb 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:
  ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options
  ARM: Fix wrong dmb
  ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock
  ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards
  ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h
  ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing includes
  ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set
  ARM: 5868/1: ARM: fix "BUG: using smp_processor_id() in preemptible code"
  ARM: 5867/1: Update U300 defconfig
  ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs
  [ARM] pxa: fix strange characters in zaurus gpio .desc
  ARM: add missing recvmmsg syscall number
  [ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()
  [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'
  [ARM] pxa: enable L2 if present in XSC3
  [ARM] pxa: do not enable L2 after MMU is enabled
parents f25bb39f aff7b4f8

arch/arm/configs/u300_defconfig

+71 −10
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.32-rc5

# Sat Oct 17 23:32:24 2009

# Linux kernel version: 2.6.33-rc2

# Wed Jan  6 00:01:36 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -46,6 +46,7 @@ CONFIG_SYSVIPC_SYSCTL=y 
#

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_TINY_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=32

# CONFIG_RCU_FANOUT_EXACT is not set
@@ -119,14 +120,41 @@ CONFIG_BLOCK=y 
# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

# CONFIG_IOSCHED_AS is not set

CONFIG_IOSCHED_DEADLINE=y

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_DEFAULT_AS is not set

CONFIG_DEFAULT_DEADLINE=y

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

# CONFIG_INLINE_SPIN_TRYLOCK is not set

# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK is not set

# CONFIG_INLINE_SPIN_LOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK_IRQ is not set

# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set

# CONFIG_INLINE_SPIN_UNLOCK is not set

# CONFIG_INLINE_SPIN_UNLOCK_BH is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_READ_TRYLOCK is not set

# CONFIG_INLINE_READ_LOCK is not set

# CONFIG_INLINE_READ_LOCK_BH is not set

# CONFIG_INLINE_READ_LOCK_IRQ is not set

# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set

# CONFIG_INLINE_READ_UNLOCK is not set

# CONFIG_INLINE_READ_UNLOCK_BH is not set

# CONFIG_INLINE_READ_UNLOCK_IRQ is not set

# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_WRITE_TRYLOCK is not set

# CONFIG_INLINE_WRITE_LOCK is not set

# CONFIG_INLINE_WRITE_LOCK_BH is not set

# CONFIG_INLINE_WRITE_LOCK_IRQ is not set

# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set

# CONFIG_INLINE_WRITE_UNLOCK is not set

# CONFIG_INLINE_WRITE_UNLOCK_BH is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

# CONFIG_MUTEX_SPIN_ON_OWNER is not set

# CONFIG_FREEZER is not set



#
@@ -155,6 +183,7 @@ CONFIG_MMU=y 
# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_DOVE is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set
@@ -177,6 +206,7 @@ CONFIG_ARCH_U300=y 
# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_U8500 is not set



#

# ST-Ericsson AB U300/U330/U335/U365 Platform
@@ -265,12 +295,10 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4096

CONFIG_SPLIT_PTLOCK_CPUS=999999

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y
@@ -499,14 +527,21 @@ CONFIG_MTD_NAND_IDS=y 
CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_LOOP is not set



#

# DRBD disabled because PROC_FS, INET or CONNECTOR not selected

#

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

CONFIG_MISC_DEVICES=y

# CONFIG_AD525X_DPOT is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ISL29003 is not set

# CONFIG_DS1682 is not set

# CONFIG_TI_DAC7512 is not set

# CONFIG_C2PORT is not set



#
@@ -517,6 +552,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_MAX6875 is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_IWMC3200TOP is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -539,6 +575,7 @@ CONFIG_HAVE_IDE=y 
CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set

# CONFIG_INPUT_SPARSEKMAP is not set



#

# Userland interfaces
@@ -645,7 +682,6 @@ CONFIG_I2C_STU300=y 
#

# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -661,6 +697,8 @@ CONFIG_SPI_MASTER=y 
# CONFIG_SPI_BITBANG is not set

# CONFIG_SPI_GPIO is not set

CONFIG_SPI_PL022=y

# CONFIG_SPI_XILINX is not set

# CONFIG_SPI_DESIGNWARE is not set



#

# SPI Protocol Masters
@@ -708,6 +746,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_T7L66XB is not set

# CONFIG_MFD_TC6387XB is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set
@@ -716,6 +755,8 @@ CONFIG_SSB_POSSIBLE=y 
CONFIG_AB3100_CORE=y

CONFIG_AB3100_OTP=y

# CONFIG_EZX_PCAP is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_AB4500_CORE is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -723,6 +764,7 @@ CONFIG_REGULATOR=y 
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

# CONFIG_REGULATOR_MAX8660 is not set

# CONFIG_REGULATOR_LP3971 is not set

CONFIG_REGULATOR_AB3100=y

# CONFIG_REGULATOR_TPS65023 is not set
@@ -840,7 +882,9 @@ CONFIG_LEDS_CLASS=y 
# CONFIG_LEDS_LP3944 is not set

# CONFIG_LEDS_PCA955X is not set

# CONFIG_LEDS_DAC124S085 is not set

# CONFIG_LEDS_REGULATOR is not set

# CONFIG_LEDS_BD2802 is not set

# CONFIG_LEDS_LT3593 is not set



#

# LED Triggers
@@ -882,6 +926,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_BQ32K is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set
@@ -911,7 +956,9 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

# CONFIG_RTC_DRV_M48T59 is not set

# CONFIG_RTC_DRV_MSM6242 is not set

# CONFIG_RTC_DRV_BQ4802 is not set

# CONFIG_RTC_DRV_RP5C01 is not set

# CONFIG_RTC_DRV_V3020 is not set

CONFIG_RTC_DRV_AB3100=y
@@ -926,6 +973,15 @@ CONFIG_DMADEVICES=y 
#

# DMA Devices

#

CONFIG_COH901318=y

CONFIG_DMA_ENGINE=y



#

# DMA Clients

#

# CONFIG_NET_DMA is not set

# CONFIG_ASYNC_TX_DMA is not set

# CONFIG_DMATEST is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set
@@ -1018,7 +1074,7 @@ CONFIG_MISC_FILESYSTEMS=y 
CONFIG_MSDOS_PARTITION=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

# CONFIG_NLS_CODEPAGE_437 is not set

CONFIG_NLS_CODEPAGE_437=y

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

# CONFIG_NLS_CODEPAGE_850 is not set
@@ -1135,6 +1191,7 @@ CONFIG_ARM_UNWIND=y 
# CONFIG_DEBUG_ERRORS is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_LL is not set

# CONFIG_OC_ETM is not set



#

# Security options
@@ -1142,7 +1199,11 @@ CONFIG_ARM_UNWIND=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_DEFAULT_SECURITY_SELINUX is not set

# CONFIG_DEFAULT_SECURITY_SMACK is not set

# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY=""

# CONFIG_CRYPTO is not set

# CONFIG_BINARY_PRINTF is not set

arch/arm/include/asm/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define __ASM_ARM_CPU_H



#include <linux/percpu.h>

#include <linux/cpu.h>



struct cpuinfo_arm {

	struct cpu	cpu;

arch/arm/include/asm/dma.h

+2 −2
Original line number Diff line number Diff line
@@ -138,12 +138,12 @@ extern int get_dma_residue(unsigned int chan); 
#define NO_DMA	255

#endif



#endif /* CONFIG_ISA_DMA_API */



#ifdef CONFIG_PCI

extern int isa_dma_bridge_buggy;

#else

#define isa_dma_bridge_buggy    (0)

#endif



#endif /* CONFIG_ISA_DMA_API */



#endif /* __ASM_ARM_DMA_H */

arch/arm/include/asm/ptrace.h

+6 −0
Original line number Diff line number Diff line
@@ -97,9 +97,15 @@ 
 * stack during a system call.  Note that sizeof(struct pt_regs)

 * has to be a multiple of 8.

 */

#ifndef __KERNEL__

struct pt_regs {

	long uregs[18];

};

#else /* __KERNEL__ */

struct pt_regs {

	unsigned long uregs[18];

};

#endif /* __KERNEL__ */



#define ARM_cpsr	uregs[16]

#define ARM_pc		uregs[15]

arch/arm/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ 
#define __NR_pwritev			(__NR_SYSCALL_BASE+362)

#define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)

#define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)

#define __NR_recvmmsg			(__NR_SYSCALL_BASE+365)



/*

 * The following SWIs are ARM private.