Commit 325ce9e3 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] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h
  [ARM] pxa/spitz: fix On/off key name to fix warning during boot
  [ARM] pxa: fix the incorrect cpu_is_pxa950()
  [ARM] pxa: update cpuid pattern for pxa9xx in head.S
  [ARM] pxa/viper: fix timeout usage for I2C
  [ARM] pxa/raumfeld: fix button name
  [ARM] pxa/imote2: Fix iMote2 defconfig
  [ARM] pxa: add missing new line to regs-u2d.h
  ARM: 6093/1: Fix kernel memory printing for sparsemem
  arch/arm/include/asm/elf.h: forward-declare the task-struct
  arch/arm/plat-pxa/dma.c: correct NULL test
  ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver
  ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600
  ARM: Update mach-types
  ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002
  ARM: 6068/1: Fix build break with KPROBES enabled
  mx5: Fix build error for mx51_defconfig
parents bbfdbe9d 257dab81

arch/arm/boot/compressed/head.S

+2 −8
Original line number Diff line number Diff line
@@ -685,8 +685,8 @@ proc_types: 
		W(b)	__armv4_mmu_cache_off

		W(b)	__armv4_mmu_cache_flush



		.word	0x56056930

		.word	0xff0ffff0		@ PXA935

		.word	0x56056900

		.word	0xffffff00		@ PXA9xx

		W(b)	__armv4_mmu_cache_on

		W(b)	__armv4_mmu_cache_off

		W(b)	__armv4_mmu_cache_flush
@@ -697,12 +697,6 @@ proc_types: 
		W(b)	__armv4_mmu_cache_off

		W(b)	__armv5tej_mmu_cache_flush



		.word	0x56056930

		.word	0xff0ffff0		@ PXA935

		W(b)	__armv4_mmu_cache_on

		W(b)	__armv4_mmu_cache_off

		W(b)	__armv4_mmu_cache_flush



		.word	0x56050000		@ Feroceon

		.word	0xff0f0000

		W(b)	__armv4_mmu_cache_on

arch/arm/configs/imote2_defconfig

+67 −105
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc8

# Sat Feb 13 21:48:53 2010

# Linux kernel version: 2.6.34-rc2

# Thu Apr  8 14:49:08 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -19,6 +20,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_ARCH_HAS_CPUFREQ=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_NEED_DMA_MAP_STATE=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000
@@ -60,11 +62,6 @@ CONFIG_RCU_FANOUT=32 
# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y
@@ -97,10 +94,14 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_EVENTS=y

CONFIG_PERF_USE_VMALLOC=y



#

# Kernel Performance Events And Counters

#

# CONFIG_PERF_EVENTS is not set

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y
@@ -184,6 +185,7 @@ CONFIG_MMU=y 
# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set
@@ -193,7 +195,6 @@ CONFIG_MMU=y 
# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -210,21 +211,26 @@ CONFIG_MMU=y 
# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_NUC93X is not set

# CONFIG_ARCH_PNX4008 is not set

CONFIG_ARCH_PXA=y

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_SHMOBILE is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_S5P6440 is not set

# CONFIG_ARCH_S5P6442 is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

# CONFIG_ARCH_U8500 is not set

# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_U8500 is not set



#

# Intel PXA2xx/PXA3xx Implementations
@@ -253,6 +259,7 @@ CONFIG_ARCH_PXA=y 
# CONFIG_MACH_EM_X270 is not set

# CONFIG_MACH_EXEDA is not set

# CONFIG_MACH_CM_X300 is not set

# CONFIG_MACH_CAPC7117 is not set

# CONFIG_ARCH_GUMSTIX is not set

CONFIG_MACH_INTELMOTE2=y

# CONFIG_MACH_STARGATE2 is not set
@@ -275,7 +282,11 @@ CONFIG_MACH_INTELMOTE2=y 
# CONFIG_PXA_EZX is not set

# CONFIG_MACH_MP900C is not set

# CONFIG_ARCH_PXA_PALM is not set

# CONFIG_MACH_RAUMFELD_RC is not set

# CONFIG_MACH_RAUMFELD_CONNECTOR is not set

# CONFIG_MACH_RAUMFELD_SPEAKER is not set

# CONFIG_PXA_SHARPSL is not set

# CONFIG_MACH_ICONTROL is not set

# CONFIG_ARCH_PXA_ESERIES is not set

CONFIG_PXA27x=y

CONFIG_PXA_SSP=y
@@ -302,6 +313,7 @@ CONFIG_ARM_THUMB=y 
CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_IWMMXT=y

CONFIG_XSCALE_PMU=y

CONFIG_CPU_HAS_PMU=y

CONFIG_COMMON_CLKDEV=y



#
@@ -352,7 +364,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug"

CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M"

# CONFIG_XIP_KERNEL is not set

CONFIG_KEXEC=y

CONFIG_ATAGS_PROC=y
@@ -360,24 +372,8 @@ CONFIG_ATAGS_PROC=y 
#

# CPU Power Management

#

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

CONFIG_CPU_FREQ_DEBUG=y

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE_GOV_LADDER=y

CONFIG_CPU_IDLE_GOV_MENU=y

# CONFIG_CPU_FREQ is not set

# CONFIG_CPU_IDLE is not set



#

# Floating point emulation
@@ -409,6 +405,7 @@ CONFIG_SUSPEND=y 
CONFIG_SUSPEND_FREEZER=y

CONFIG_APM_EMULATION=y

CONFIG_PM_RUNTIME=y

CONFIG_PM_OPS=y

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_NET=y
@@ -416,7 +413,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set
@@ -506,6 +502,7 @@ CONFIG_NF_CT_NETLINK=m 
CONFIG_NETFILTER_XTABLES=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set

# CONFIG_NETFILTER_XT_TARGET_CT is not set

# CONFIG_NETFILTER_XT_TARGET_DSCP is not set

CONFIG_NETFILTER_XT_TARGET_HL=m

CONFIG_NETFILTER_XT_TARGET_LED=m
@@ -622,6 +619,7 @@ CONFIG_IP6_NF_RAW=m 
# CONFIG_ATM is not set

CONFIG_STP=m

CONFIG_BRIDGE=m

# CONFIG_BRIDGE_IGMP_SNOOPING is not set

# CONFIG_NET_DSA is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set
@@ -646,32 +644,7 @@ CONFIG_NET_CLS_ROUTE=y 
# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

CONFIG_BT=y

CONFIG_BT_L2CAP=y

CONFIG_BT_SCO=y

CONFIG_BT_RFCOMM=y

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=y

CONFIG_BT_BNEP_MC_FILTER=y

CONFIG_BT_BNEP_PROTO_FILTER=y

CONFIG_BT_HIDP=y



#

# Bluetooth device drivers

#

CONFIG_BT_HCIBTUSB=m

CONFIG_BT_HCIBTSDIO=m

CONFIG_BT_HCIUART=y

CONFIG_BT_HCIUART_H4=y

# CONFIG_BT_HCIUART_BCSP is not set

# CONFIG_BT_HCIUART_LL is not set

CONFIG_BT_HCIBCM203X=m

CONFIG_BT_HCIBPA10X=m

CONFIG_BT_HCIBFUSB=m

CONFIG_BT_HCIVHCI=m

CONFIG_BT_MRVL=m

CONFIG_BT_MRVL_SDIO=m

# CONFIG_BT_ATH3K is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

CONFIG_FIB_RULES=y

# CONFIG_WIRELESS is not set
@@ -687,7 +660,8 @@ CONFIG_FIB_RULES=y 
# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_DEVTMPFS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m
@@ -703,9 +677,9 @@ CONFIG_MTD=y 
# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set

# CONFIG_MTD_AFS_PARTS is not set

# CONFIG_MTD_AR7_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_AFS_PARTS=y

CONFIG_MTD_AR7_PARTS=y



#

# User Modules And Translation Layers
@@ -812,6 +786,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set
@@ -965,6 +940,7 @@ CONFIG_SERIAL_PXA=y 
CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -993,6 +969,7 @@ CONFIG_I2C_HELPER_AUTO=y 
CONFIG_I2C_PXA=y

# CONFIG_I2C_PXA_SLAVE is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -1006,15 +983,9 @@ CONFIG_I2C_PXA=y 
#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y
@@ -1046,10 +1017,12 @@ CONFIG_GPIO_SYSFS=y 
#

# Memory mapped GPIO expanders:

#

# CONFIG_GPIO_IT8761E is not set



#

# I2C GPIO expanders:

#

# CONFIG_GPIO_MAX7300 is not set

# CONFIG_GPIO_MAX732X is not set

# CONFIG_GPIO_PCA953X is not set

# CONFIG_GPIO_PCF857X is not set
@@ -1093,10 +1066,12 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_ASIC3 is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_HTC_I2CPLD is not set

# CONFIG_TPS65010 is not set

# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set
@@ -1105,22 +1080,25 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_TC6393XB is not set

CONFIG_PMIC_DA903X=y

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_MAX8925 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_WM8994 is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_MFD_MC13783 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_AB4500_CORE is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DEBUG=y

# CONFIG_REGULATOR_DUMMY is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

CONFIG_REGULATOR_VIRTUAL_CONSUMER=y

CONFIG_REGULATOR_USERSPACE_CONSUMER=y

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

# CONFIG_REGULATOR_MAX8649 is not set

# CONFIG_REGULATOR_MAX8660 is not set

CONFIG_REGULATOR_DA903X=y

# CONFIG_REGULATOR_LP3971 is not set
@@ -1218,6 +1196,7 @@ CONFIG_VIDEO_IR_I2C=y 
# CONFIG_VIDEO_SAA7191 is not set

# CONFIG_VIDEO_TVP514X is not set

# CONFIG_VIDEO_TVP5150 is not set

# CONFIG_VIDEO_TVP7002 is not set

# CONFIG_VIDEO_VPX3220 is not set



#
@@ -1264,15 +1243,7 @@ CONFIG_SOC_CAMERA_MT9M111=y 
CONFIG_VIDEO_PXA27x=y

# CONFIG_VIDEO_SH_MOBILE_CEU is not set

# CONFIG_V4L_USB_DRIVERS is not set

CONFIG_RADIO_ADAPTERS=y

# CONFIG_I2C_SI4713 is not set

# CONFIG_RADIO_SI4713 is not set

# CONFIG_USB_DSBR is not set

# CONFIG_RADIO_SI470X is not set

# CONFIG_USB_MR800 is not set

CONFIG_RADIO_TEA5764=y

CONFIG_RADIO_TEA5764_XTAL=y

# CONFIG_RADIO_TEF6862 is not set

# CONFIG_RADIO_ADAPTERS is not set

# CONFIG_DAB is not set



#
@@ -1398,8 +1369,6 @@ CONFIG_HID=y 
#

# Special HID drivers

#

CONFIG_HID_APPLE=m

# CONFIG_HID_WACOM is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1477,7 +1446,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set
@@ -1489,7 +1457,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG is not set

# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1529,6 +1496,7 @@ CONFIG_USB_ETH=y 
# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_CDC_COMPOSITE is not set

# CONFIG_USB_G_NOKIA is not set

# CONFIG_USB_G_MULTI is not set



#
@@ -1555,8 +1523,6 @@ CONFIG_SDIO_UART=m 
#

CONFIG_MMC_PXA=y

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_AT91 is not set

# CONFIG_MMC_ATMELMCI is not set

CONFIG_MMC_SPI=y

# CONFIG_MEMSTICK is not set

CONFIG_NEW_LEDS=y
@@ -1574,11 +1540,11 @@ CONFIG_LEDS_LP3944=y 
# CONFIG_LEDS_REGULATOR is not set

# CONFIG_LEDS_BD2802 is not set

# CONFIG_LEDS_LT3593 is not set

CONFIG_LEDS_TRIGGERS=y



#

# LED Triggers

#

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y
@@ -1656,7 +1622,7 @@ CONFIG_RTC_INTF_DEV=y 
# on-CPU RTC drivers

#

# CONFIG_RTC_DRV_SA1100 is not set

# CONFIG_RTC_DRV_PXA is not set

CONFIG_RTC_DRV_PXA=y

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set
@@ -1681,19 +1647,10 @@ CONFIG_EXT3_FS_XATTR=y 
CONFIG_JBD=m

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=m

CONFIG_REISERFS_FS=m

# CONFIG_REISERFS_CHECK is not set

# CONFIG_REISERFS_PROC_INFO is not set

CONFIG_REISERFS_FS_XATTR=y

CONFIG_REISERFS_FS_POSIX_ACL=y

CONFIG_REISERFS_FS_SECURITY=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_XFS_FS=m

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_POSIX_ACL is not set

# CONFIG_XFS_RT is not set

# CONFIG_XFS_DEBUG is not set

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

# CONFIG_NILFS2_FS is not set
@@ -1716,9 +1673,7 @@ CONFIG_CUSE=m 
#

# CD-ROM/DVD Filesystems

#

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_ZISOFS=y

# CONFIG_ISO9660_FS is not set

# CONFIG_UDF_FS is not set



#
@@ -1750,12 +1705,14 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

CONFIG_JFFS2_FS=m

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_FS_WBUF_VERIFY is not set

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

CONFIG_JFFS2_FS_WBUF_VERIFY=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_FS_XATTR=y

CONFIG_JFFS2_FS_POSIX_ACL=y

CONFIG_JFFS2_FS_SECURITY=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_LZO=y
@@ -1765,6 +1722,7 @@ CONFIG_JFFS2_RUBIN=y 
CONFIG_JFFS2_CMODE_PRIORITY=y

# CONFIG_JFFS2_CMODE_SIZE is not set

# CONFIG_JFFS2_CMODE_FAVOURLZO is not set

# CONFIG_LOGFS is not set

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

# CONFIG_SQUASHFS_EMBEDDED is not set
@@ -1802,6 +1760,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_SPKM3 is not set

CONFIG_SMB_FS=m

# CONFIG_SMB_NLS_DEFAULT is not set

# CONFIG_CEPH_FS is not set

CONFIG_CIFS=m

CONFIG_CIFS_STATS=y

# CONFIG_CIFS_STATS2 is not set
@@ -1895,6 +1854,7 @@ CONFIG_DEBUG_SPINLOCK=y 
CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_LOCK_ALLOC=y

CONFIG_PROVE_LOCKING=y

# CONFIG_PROVE_RCU is not set

CONFIG_LOCKDEP=y

# CONFIG_LOCK_STAT is not set

# CONFIG_DEBUG_LOCKDEP is not set
@@ -1918,6 +1878,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -2061,9 +2022,9 @@ CONFIG_CRC32=y 
CONFIG_CRC7=y

CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_LZO_COMPRESS=m

CONFIG_LZO_DECOMPRESS=m

CONFIG_ZLIB_DEFLATE=y

CONFIG_LZO_COMPRESS=y

CONFIG_LZO_DECOMPRESS=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_DECOMPRESS_BZIP2=y

CONFIG_DECOMPRESS_LZMA=y
@@ -2075,3 +2036,4 @@ CONFIG_HAS_IOMEM=y 
CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_NLATTR=y

CONFIG_GENERIC_ATOMIC64=y

arch/arm/include/asm/elf.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <asm/ptrace.h>

#include <asm/user.h>



struct task_struct;



typedef unsigned long elf_greg_t;

typedef unsigned long elf_freg_t[3];

arch/arm/kernel/entry-armv.S

+2 −2
Original line number Diff line number Diff line
@@ -676,10 +676,10 @@ do_fpe: 
 *  lr  = unrecognised FP instruction return address

 */



	.data

	.pushsection .data

ENTRY(fp_enter)

	.word	no_fp

	.text

	.popsection



ENTRY(no_fp)

	mov	pc, lr

arch/arm/kernel/smp.c

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ int __cpuinit __cpu_up(unsigned int cpu) 
			return PTR_ERR(idle);

		}

		ci->idle = idle;

	} else {

		/*

		 * Since this idle thread is being re-used, call

		 * init_idle() to reinitialize the thread structure.

		 */

		init_idle(idle, cpu);

	}



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE