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

Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix up the SH-3 build for recent TLB changes.
  sh: export return_address() symbol.
  sh: Enable the mmu in start_secondary()
  sh: Fix FDPIC binary loader
  arch/sh/kernel: Use set_cpus_allowed_ptr
  sh: Update ecovec_defconfig
  USB gadget r8a66597-udc.c: duplicated include
  sh: update the TLB replacement counter for entry wiring.
parents 42be79e3 be97d758

arch/sh/configs/ecovec24_defconfig

+190 −46
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc2

# Mon Jan  4 11:20:36 2010

# Linux kernel version: 2.6.34-rc2

# Mon Mar 29 02:21:58 2010

#

CONFIG_SUPERH=y

CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y 
CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_IRQ_PER_CPU=y

CONFIG_SPARSE_IRQ=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y 
CONFIG_ARCH_HAS_DEFAULT_IDLE=y

CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y

CONFIG_DMA_NONCOHERENT=y

CONFIG_NEED_DMA_MAP_STATE=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION="" 
CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_BZIP2=y

CONFIG_HAVE_KERNEL_LZMA=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_BZIP2 is not set

# CONFIG_KERNEL_LZMA is not set

# CONFIG_KERNEL_LZO is not set

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y
@@ -71,14 +74,8 @@ 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

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

# CONFIG_BLK_DEV_INITRD is not set
@@ -107,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y 
#

# Kernel Performance Events And Counters

#

# CONFIG_PERF_EVENTS is not set

CONFIG_PERF_EVENTS=y

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_COMPAT_BRK=y
@@ -116,13 +113,13 @@ CONFIG_SLAB=y 
# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_IOREMAP_PROT=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_DMA_ATTRS=y

CONFIG_HAVE_CLK=y

CONFIG_HAVE_DMA_API_DEBUG=y

CONFIG_HAVE_HW_BREAKPOINT=y



#

# GCOV-based kernel profiling
@@ -234,12 +231,12 @@ CONFIG_CPU_SUBTYPE_SH7724=y 
CONFIG_QUICKLIST=y

CONFIG_MMU=y

CONFIG_PAGE_OFFSET=0x80000000

CONFIG_FORCE_MAX_ZONEORDER=11

CONFIG_FORCE_MAX_ZONEORDER=12

CONFIG_MEMORY_START=0x08000000

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_29BIT=y

# CONFIG_PMB_ENABLE is not set

# CONFIG_X2TLB is not set

# CONFIG_PMB is not set

CONFIG_X2TLB=y

CONFIG_VSYSCALL=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -247,6 +244,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y 
CONFIG_MAX_ACTIVE_REGIONS=1

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_IOREMAP_FIXED=y

CONFIG_UNCACHED_MAPPING=y

CONFIG_PAGE_SIZE_4KB=y

# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_16KB is not set
@@ -262,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y 
CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=2

CONFIG_NR_QUICK=1

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -337,7 +336,6 @@ CONFIG_SECCOMP=y 
# CONFIG_PREEMPT_VOLUNTARY is not set

CONFIG_PREEMPT=y

CONFIG_GUSA=y

# CONFIG_SPARSE_IRQ is not set



#

# Boot options
@@ -347,7 +345,7 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000 
CONFIG_ENTRY_OFFSET=0x00001000

CONFIG_CMDLINE_OVERWRITE=y

# CONFIG_CMDLINE_EXTEND is not set

CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=120M memchunk.vpu=4m"

CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=248M memchunk.vpu=8m memchunk.veu0=4m"



#

# Bus options
@@ -373,6 +371,7 @@ CONFIG_SUSPEND=y 
CONFIG_SUSPEND_FREEZER=y

# CONFIG_HIBERNATION is not set

CONFIG_PM_RUNTIME=y

CONFIG_PM_OPS=y

# CONFIG_CPU_IDLE is not set

CONFIG_NET=y
@@ -380,7 +379,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -445,7 +443,45 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

CONFIG_IRDA=y



#

# IrDA protocols

#

# CONFIG_IRLAN is not set

# CONFIG_IRCOMM is not set

# CONFIG_IRDA_ULTRA is not set



#

# IrDA options

#

# CONFIG_IRDA_CACHE_LAST_LSAP is not set

# CONFIG_IRDA_FAST_RR is not set

# CONFIG_IRDA_DEBUG is not set



#

# Infrared-port device drivers

#



#

# SIR device drivers

#

# CONFIG_IRTTY_SIR is not set



#

# Dongle support

#

CONFIG_SH_SIR=y

# CONFIG_KINGSUN_DONGLE is not set

# CONFIG_KSDAZZLE_DONGLE is not set

# CONFIG_KS959_DONGLE is not set



#

# FIR device drivers

#

# CONFIG_USB_IRDA is not set

# CONFIG_SIGMATEL_FIR is not set

# CONFIG_MCS_FIR is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

CONFIG_WIRELESS=y
@@ -556,6 +592,7 @@ CONFIG_MTD_NAND_IDS=y 
# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

# CONFIG_MTD_ALAUDA is not set

# CONFIG_MTD_NAND_SH_FLCTL is not set

# CONFIG_MTD_ONENAND is not set



#
@@ -597,6 +634,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ISL29003 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_DS1682 is not set

# CONFIG_TI_DAC7512 is not set

# CONFIG_C2PORT is not set
@@ -616,6 +654,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI_DMA=y
@@ -768,7 +807,29 @@ CONFIG_KEYBOARD_SH_KEYSC=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_ADS7846 is not set

# CONFIG_TOUCHSCREEN_AD7877 is not set

# CONFIG_TOUCHSCREEN_AD7879_I2C is not set

# CONFIG_TOUCHSCREEN_AD7879_SPI is not set

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_DYNAPRO is not set

# CONFIG_TOUCHSCREEN_EETI is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set

# CONFIG_TOUCHSCREEN_MCS5000 is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_INEXIO is not set

# CONFIG_TOUCHSCREEN_MK712 is not set

# CONFIG_TOUCHSCREEN_PENMOUNT is not set

# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set

# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set

# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set

CONFIG_TOUCHSCREEN_TSC2007=y

# CONFIG_TOUCHSCREEN_W90X900 is not set

# CONFIG_INPUT_MISC is not set



#
@@ -802,10 +863,10 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6 
CONFIG_SERIAL_SH_SCI_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

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -830,6 +891,7 @@ CONFIG_I2C_HELPER_AUTO=y 
# CONFIG_I2C_OCORES is not set

CONFIG_I2C_SH_MOBILE=y

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -843,15 +905,9 @@ CONFIG_I2C_SH_MOBILE=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_MASTER=y
@@ -882,13 +938,16 @@ CONFIG_GPIOLIB=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

# CONFIG_GPIO_ADP5588 is not set



#

# PCI GPIO expanders:
@@ -919,23 +978,26 @@ CONFIG_SSB_POSSIBLE=y 
#

# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

CONFIG_MFD_CORE=y

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_SH_MOBILE_SDHI is not set

CONFIG_MFD_SH_MOBILE_SDHI=y

# 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

# CONFIG_PMIC_DA903X is not set

# 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 is not set

CONFIG_MEDIA_SUPPORT=y
@@ -985,10 +1047,10 @@ CONFIG_SOC_CAMERA=y 
# CONFIG_SOC_CAMERA_MT9M001 is not set

# CONFIG_SOC_CAMERA_MT9M111 is not set

# CONFIG_SOC_CAMERA_MT9T031 is not set

# CONFIG_SOC_CAMERA_MT9T112 is not set

CONFIG_SOC_CAMERA_MT9T112=y

# CONFIG_SOC_CAMERA_MT9V022 is not set

# CONFIG_SOC_CAMERA_RJ54N1 is not set

# CONFIG_SOC_CAMERA_TW9910 is not set

CONFIG_SOC_CAMERA_TW9910=y

# CONFIG_SOC_CAMERA_PLATFORM is not set

# CONFIG_SOC_CAMERA_OV772X is not set

# CONFIG_SOC_CAMERA_OV9640 is not set
@@ -1001,6 +1063,7 @@ CONFIG_RADIO_ADAPTERS=y 
# CONFIG_RADIO_SI470X is not set

# CONFIG_USB_MR800 is not set

# CONFIG_RADIO_TEA5764 is not set

# CONFIG_RADIO_SAA7706H is not set

# CONFIG_RADIO_TEF6862 is not set

# CONFIG_DAB is not set
@@ -1034,6 +1097,7 @@ CONFIG_FB_DEFERRED_IO=y 
#

# CONFIG_FB_S1D13XXX is not set

CONFIG_FB_SH_MOBILE_LCDC=y

# CONFIG_FB_TMIO is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set
@@ -1062,7 +1126,46 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_SUPERH_MONO is not set

# CONFIG_LOGO_SUPERH_VGA16 is not set

CONFIG_LOGO_SUPERH_CLUT224=y

# CONFIG_SOUND is not set

CONFIG_SOUND=y

CONFIG_SOUND_OSS_CORE=y

CONFIG_SOUND_OSS_CORE_PRECLAIM=y

CONFIG_SND=y

CONFIG_SND_TIMER=y

CONFIG_SND_PCM=y

CONFIG_SND_JACK=y

CONFIG_SND_SEQUENCER=y

CONFIG_SND_SEQ_DUMMY=y

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

CONFIG_SND_PCM_OSS_PLUGINS=y

# CONFIG_SND_SEQUENCER_OSS is not set

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

CONFIG_SND_VERBOSE_PROCFS=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

# CONFIG_SND_RAWMIDI_SEQ is not set

# CONFIG_SND_OPL3_LIB_SEQ is not set

# CONFIG_SND_OPL4_LIB_SEQ is not set

# CONFIG_SND_SBAWE_SEQ is not set

# CONFIG_SND_EMU10K1_SEQ is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_SPI is not set

CONFIG_SND_SUPERH=y

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y



#

# SoC Audio support for SuperH

#

CONFIG_SND_SOC_SH4_FSI=y

# CONFIG_SND_FSI_AK4642 is not set

CONFIG_SND_FSI_DA7210=y

CONFIG_SND_SOC_I2C_AND_SPI=y

# CONFIG_SND_SOC_ALL_CODECS is not set

CONFIG_SND_SOC_DA7210=y

# CONFIG_SOUND_PRIME is not set

CONFIG_HID_SUPPORT=y

CONFIG_HID=y

# CONFIG_HIDRAW is not set
@@ -1077,6 +1180,7 @@ CONFIG_USB_HID=y 
#

# Special HID drivers

#

# CONFIG_HID_3M_PCT is not set

# CONFIG_HID_A4TECH is not set

# CONFIG_HID_APPLE is not set

# CONFIG_HID_BELKIN is not set
@@ -1091,12 +1195,16 @@ CONFIG_USB_HID=y 
# CONFIG_HID_KENSINGTON is not set

# CONFIG_HID_LOGITECH is not set

# CONFIG_HID_MICROSOFT is not set

# CONFIG_HID_MOSART is not set

# CONFIG_HID_MONTEREY is not set

# CONFIG_HID_NTRIG is not set

# CONFIG_HID_ORTEK is not set

# CONFIG_HID_PANTHERLORD is not set

# CONFIG_HID_PETALYNX is not set

# CONFIG_HID_QUANTA is not set

# CONFIG_HID_SAMSUNG is not set

# CONFIG_HID_SONY is not set

# CONFIG_HID_STANTUM is not set

# CONFIG_HID_SUNPLUS is not set

# CONFIG_HID_GREENASIA is not set

# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1136,6 +1244,7 @@ CONFIG_USB_MON=y 
# CONFIG_USB_SL811_HCD is not set

CONFIG_USB_R8A66597_HCD=y

# CONFIG_USB_HWA_HCD is not set

# CONFIG_USB_GADGET_MUSB_HDRC is not set



#

# USB Device Class drivers
@@ -1188,7 +1297,6 @@ CONFIG_USB_STORAGE=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
@@ -1200,8 +1308,45 @@ CONFIG_USB_STORAGE=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 is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG_FILES is not set

# CONFIG_USB_GADGET_DEBUG_FS is not set

CONFIG_USB_GADGET_VBUS_DRAW=2

CONFIG_USB_GADGET_SELECTED=y

# CONFIG_USB_GADGET_AT91 is not set

# CONFIG_USB_GADGET_ATMEL_USBA is not set

# CONFIG_USB_GADGET_FSL_USB2 is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_PXA25X is not set

CONFIG_USB_GADGET_R8A66597=y

CONFIG_USB_R8A66597=y

# CONFIG_USB_GADGET_PXA27X is not set

# CONFIG_USB_GADGET_S3C_HSOTG is not set

# CONFIG_USB_GADGET_IMX is not set

# CONFIG_USB_GADGET_S3C2410 is not set

# CONFIG_USB_GADGET_M66592 is not set

# CONFIG_USB_GADGET_AMD5536UDC is not set

# CONFIG_USB_GADGET_FSL_QE is not set

# CONFIG_USB_GADGET_CI13XXX is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LANGWELL is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

CONFIG_USB_GADGET_DUALSPEED=y

# CONFIG_USB_ZERO is not set

# CONFIG_USB_AUDIO is not set

# CONFIG_USB_ETH is not set

# CONFIG_USB_GADGETFS is not set

CONFIG_USB_FILE_STORAGE=m

# CONFIG_USB_FILE_STORAGE_TEST is not set

# CONFIG_USB_MASS_STORAGE is not set

# CONFIG_USB_G_SERIAL is not set

# 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



#

# OTG and related infrastructure
@@ -1224,10 +1369,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y 
# MMC/SD/SDIO Host Controller Drivers

#

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_AT91 is not set

# CONFIG_MMC_ATMELMCI is not set

CONFIG_MMC_SPI=y

# CONFIG_MMC_TMIO is not set

CONFIG_MMC_TMIO=y

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set
@@ -1253,10 +1396,10 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_DS1374 is not set

# CONFIG_RTC_DRV_DS1672 is not set

# CONFIG_RTC_DRV_MAX6900 is not set

# CONFIG_RTC_DRV_RS5C372 is not set

CONFIG_RTC_DRV_RS5C372=y

# CONFIG_RTC_DRV_ISL1208 is not set

# CONFIG_RTC_DRV_X1205 is not set

CONFIG_RTC_DRV_PCF8563=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
@@ -1303,8 +1446,6 @@ CONFIG_RTC_DRV_PCF8563=y 
CONFIG_UIO=y

# CONFIG_UIO_PDRV is not set

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_UIO_SMX is not set

# CONFIG_UIO_SERCOS3 is not set



#

# TI VLYNQ
@@ -1390,6 +1531,7 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_EFS_FS is not set

# CONFIG_JFFS2_FS is not set

# CONFIG_UBIFS_FS is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1418,6 +1560,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set
@@ -1487,6 +1630,7 @@ CONFIG_DEBUG_FS=y 
CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_MEMORY_INIT is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_LKDTM is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1618,7 +1762,7 @@ CONFIG_CRYPTO_HW=y 
#

CONFIG_BITREVERSE=y

CONFIG_GENERIC_FIND_LAST_BIT=y

# CONFIG_CRC_CCITT is not set

CONFIG_CRC_CCITT=y

# CONFIG_CRC16 is not set

CONFIG_CRC_T10DIF=y

CONFIG_CRC_ITU_T=y

arch/sh/include/asm/elf.h

+4 −2
Original line number Diff line number Diff line
@@ -211,7 +211,9 @@ extern void __kernel_vsyscall; 


#define VSYSCALL_AUX_ENT					\

	if (vdso_enabled)					\

		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);

		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);	\

	else							\

		NEW_AUX_ENT(AT_IGNORE, 0);

#else

#define VSYSCALL_AUX_ENT

#endif /* CONFIG_VSYSCALL */
@@ -219,7 +221,7 @@ extern void __kernel_vsyscall; 
#ifdef CONFIG_SH_FPU

#define FPU_AUX_ENT	NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT)

#else

#define FPU_AUX_ENT

#define FPU_AUX_ENT	NEW_AUX_ENT(AT_IGNORE, 0)

#endif



extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;

arch/sh/include/cpu-sh4/cpu/mmu_context.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#define MMUCR_URB		0x00FC0000

#define MMUCR_URB_SHIFT		18

#define MMUCR_URB_NENTRIES	64

#define MMUCR_URC		0x0000FC00

#define MMUCR_URC_SHIFT		10



#if defined(CONFIG_32BIT) && defined(CONFIG_CPU_SUBTYPE_ST40)

#define MMUCR_SE		(1 << 4)

arch/sh/kernel/cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy, 
		return -ENODEV;



	cpus_allowed = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));



	BUG_ON(smp_processor_id() != cpu);
@@ -66,7 +66,7 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy, 
	freqs.flags	= 0;



	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);

	clk_set_rate(cpuclk, freq);

	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

arch/sh/kernel/return_address.c

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * for more details.

 */

#include <linux/kernel.h>

#include <linux/module.h>

#include <asm/dwarf.h>



#ifdef CONFIG_DWARF_UNWINDER
@@ -52,3 +53,5 @@ void *return_address(unsigned int depth) 
}



#endif



EXPORT_SYMBOL_GPL(return_address);

CRA Git | Maintained and supported by SUSTech CRA and CCSE