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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
  sh: include ax88796 in the defconfig for r7785rp
  sh: include ax88796 in the defconfig for r7780mp
  sh: fix R2D-1 CF support
  fb: Orphan imsttfb.
  sh: Update mailing list info.
  sh: lockless UTLB miss fast-path.
  sh: Kill off UTLB flush in fast-path.
  sh: Fix copy_{to,from}_user_page() with cache disabled.
parents cdb32706 9a876d60

MAINTAINERS

+4 −12
Original line number Diff line number Diff line
@@ -1914,10 +1914,8 @@ L: linux1394-devel@lists.sourceforge.net 
S:	Maintained



IMS TWINTURBO FRAMEBUFFER DRIVER

P:	Paul Mundt

M:	lethal@chaoticdreams.org

L:	linux-fbdev-devel@lists.sourceforge.net (subscribers-only)

S:	Maintained

S:	Orphan



INFINIBAND SUBSYSTEM

P:	Roland Dreier
@@ -3636,18 +3634,12 @@ M: laredo@gnu.org 
W:	http://www.stradis.com/

S:	Maintained



SUPERH (sh)

P:	Paul Mundt

M:	lethal@linux-sh.org

L:	linuxsh-dev@lists.sourceforge.net (subscribers-only)

W:	http://www.linux-sh.org

S:	Maintained



SUPERH64 (sh64)

SUPERH

P:	Paul Mundt

M:	lethal@linux-sh.org

L:	linuxsh-shmedia-dev@lists.sourceforge.net

L:	linux-sh@vger.kernel.org

W:	http://www.linux-sh.org

T:	git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

S:	Maintained



SUN3/3X

arch/sh/boards/renesas/rts7751r2d/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -53,10 +53,12 @@ static struct resource cf_ide_resources[] = { 
		.end	= PA_AREA5_IO + 0x80c,

		.flags	= IORESOURCE_MEM,

	},

#ifndef CONFIG_RTS7751R2D_1 /* For R2D-1 polling is preferred */

	[2] = {

		.start	= IRQ_CF_IDE,

		.flags	= IORESOURCE_IRQ,

	},

#endif

};



static struct pata_platform_info pata_info = {

arch/sh/configs/r7780mp_defconfig

+89 −198
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.22-rc4

# Mon Jun 11 10:24:57 2007

# Linux kernel version: 2.6.24-rc2

# Tue Nov 13 20:32:39 2007

#

CONFIG_SUPERH=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -13,38 +13,39 @@ CONFIG_GENERIC_IRQ_PROBE=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_SYS_SUPPORTS_PCI=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_ARCH_NO_VIRT_TO_BUS=y

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



#

# Code maturity level options

# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup

#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_SYSVIPC_SYSCTL=y

# CONFIG_POSIX_MQUEUE is not set

CONFIG_BSD_PROCESS_ACCT=y

# CONFIG_BSD_PROCESS_ACCT_V3 is not set

# CONFIG_TASKSTATS is not set

# CONFIG_UTS_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_SYSFS_DEPRECATED is not set

# CONFIG_RELAY is not set

# CONFIG_BLK_DEV_INITRD is not set
@@ -65,7 +66,6 @@ CONFIG_BASE_FULL=y 
CONFIG_ANON_INODES=y

# CONFIG_EPOLL is not set

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y
@@ -74,24 +74,17 @@ CONFIG_SLAB=y 
# CONFIG_SLOB is not set

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0



#

# Loadable module support

#

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# Block layer

#

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

# CONFIG_BLK_DEV_BSG is not set



#

# IO Schedulers
@@ -113,7 +106,6 @@ CONFIG_CPU_SH4=y 
CONFIG_CPU_SH4A=y

# CONFIG_CPU_SUBTYPE_SH7619 is not set

# CONFIG_CPU_SUBTYPE_SH7206 is not set

# CONFIG_CPU_SUBTYPE_SH7300 is not set

# CONFIG_CPU_SUBTYPE_SH7705 is not set

# CONFIG_CPU_SUBTYPE_SH7706 is not set

# CONFIG_CPU_SUBTYPE_SH7707 is not set
@@ -121,6 +113,7 @@ CONFIG_CPU_SH4A=y 
# CONFIG_CPU_SUBTYPE_SH7709 is not set

# CONFIG_CPU_SUBTYPE_SH7710 is not set

# CONFIG_CPU_SUBTYPE_SH7712 is not set

# CONFIG_CPU_SUBTYPE_SH7720 is not set

# CONFIG_CPU_SUBTYPE_SH7750 is not set

# CONFIG_CPU_SUBTYPE_SH7091 is not set

# CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -129,12 +122,10 @@ CONFIG_CPU_SH4A=y 
# CONFIG_CPU_SUBTYPE_SH7751R is not set

# CONFIG_CPU_SUBTYPE_SH7760 is not set

# CONFIG_CPU_SUBTYPE_SH4_202 is not set

# CONFIG_CPU_SUBTYPE_ST40STB1 is not set

# CONFIG_CPU_SUBTYPE_ST40GX1 is not set

# CONFIG_CPU_SUBTYPE_SH7770 is not set

CONFIG_CPU_SUBTYPE_SH7780=y

# CONFIG_CPU_SUBTYPE_SH7785 is not set

# CONFIG_CPU_SUBTYPE_SH73180 is not set

# CONFIG_CPU_SUBTYPE_SHX3 is not set

# CONFIG_CPU_SUBTYPE_SH7343 is not set

# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -169,6 +160,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_SPARSEMEM_STATIC=y

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0
@@ -178,8 +170,9 @@ CONFIG_NR_QUICK=2 
# Cache configuration

#

# CONFIG_SH_DIRECT_MAPPED is not set

# CONFIG_SH_WRITETHROUGH is not set

# CONFIG_SH_OCRAM is not set

CONFIG_CACHE_WRITEBACK=y

# CONFIG_CACHE_WRITETHROUGH is not set

# CONFIG_CACHE_OFF is not set



#

# Processor features
@@ -187,12 +180,11 @@ CONFIG_NR_QUICK=2 
CONFIG_CPU_LITTLE_ENDIAN=y

# CONFIG_CPU_BIG_ENDIAN is not set

CONFIG_SH_FPU=y

# CONFIG_SH_DSP is not set

CONFIG_SH_STORE_QUEUES=y

CONFIG_SPECULATIVE_EXECUTION=y

CONFIG_CPU_HAS_INTEVT=y

CONFIG_CPU_HAS_INTC_IRQ=y

CONFIG_CPU_HAS_SR_RB=y

CONFIG_CPU_HAS_FPU=y



#

# Board support
@@ -212,6 +204,7 @@ CONFIG_SH_PCLK_FREQ=32000000 
# CONFIG_TICK_ONESHOT is not set

# CONFIG_NO_HZ is not set

# CONFIG_HIGH_RES_TIMERS is not set

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y



#

# CPU Frequency scaling
@@ -226,7 +219,6 @@ CONFIG_SH_PCLK_FREQ=32000000 
#

# Companion Chips

#

# CONFIG_HD6446X_SERIES is not set



#

# Additional SuperH Device Drivers
@@ -244,18 +236,17 @@ CONFIG_HZ_250=y 
CONFIG_HZ=250

CONFIG_KEXEC=y

# CONFIG_CRASH_DUMP is not set

# CONFIG_SMP is not set

# CONFIG_PREEMPT_NONE is not set

# CONFIG_PREEMPT_VOLUNTARY is not set

CONFIG_PREEMPT=y

CONFIG_PREEMPT_BKL=y

CONFIG_GUSA=y



#

# Boot options

#

CONFIG_ZERO_PAGE_OFFSET=0x00001000

CONFIG_BOOT_LINK_OFFSET=0x00800000

# CONFIG_UBC_WAKEUP is not set

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
@@ -267,11 +258,8 @@ CONFIG_SH_PCIDMA_NONCOHERENT=y 
CONFIG_PCI_AUTO=y

CONFIG_PCI_AUTO_UPDATE_RESOURCES=y

# CONFIG_ARCH_SUPPORTS_MSI is not set

CONFIG_PCI_LEGACY=y

# CONFIG_PCI_DEBUG is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set

# CONFIG_HOTPLUG_PCI is not set
@@ -281,11 +269,6 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y 
CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set



#

# Power management options (EXPERIMENTAL)

#

# CONFIG_PM is not set



#

# Networking

#
@@ -327,6 +310,7 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -353,10 +337,6 @@ CONFIG_LLC=m 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set



#
@@ -376,6 +356,7 @@ CONFIG_WIRELESS_EXT=y 
# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set



#

# Device Drivers
@@ -384,33 +365,17 @@ CONFIG_WIRELESS_EXT=y 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_DEBUG_DEVRES is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set

# CONFIG_MTD is not set



#

# Parallel port support

#

# CONFIG_PARPORT is not set



#

# Plug and Play support

#

# CONFIG_PNPACPI is not set



#

# Block devices

#

# CONFIG_BLK_CPQ_DA is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_CPQ_CISS_DA is not set

# CONFIG_BLK_DEV_DAC960 is not set

# CONFIG_BLK_DEV_UMEM is not set
@@ -424,14 +389,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

CONFIG_MISC_DEVICES=y

# CONFIG_PHANTOM is not set

CONFIG_EEPROM_93CX6=y

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_BLINK is not set

# CONFIG_IDE is not set



#
@@ -439,6 +401,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 
#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI_DMA=y

# CONFIG_SCSI_TGT is not set

# CONFIG_SCSI_NETLINK is not set

CONFIG_SCSI_PROC_FS=y
@@ -468,12 +431,9 @@ CONFIG_SCSI_WAIT_SCAN=m 
# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set



#

# SCSI low-level drivers

#

# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set
@@ -483,7 +443,6 @@ CONFIG_SCSI_WAIT_SCAN=m 
# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_DPT_I2O is not set

# CONFIG_SCSI_ARCMSR is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set
@@ -548,6 +507,7 @@ CONFIG_SATA_SIL=y 
# CONFIG_PATA_OLDPIIX is not set

# CONFIG_PATA_NETCELL is not set

# CONFIG_PATA_NS87410 is not set

# CONFIG_PATA_NS87415 is not set

# CONFIG_PATA_OPTI is not set

# CONFIG_PATA_OPTIDMA is not set

# CONFIG_PATA_PDC_OLD is not set
@@ -561,59 +521,43 @@ CONFIG_SATA_SIL=y 
# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_PLATFORM=y



#

# Multi-device support (RAID and LVM)

#

# CONFIG_MD is not set



#

# Fusion MPT device support

#

# CONFIG_FUSION is not set

# CONFIG_FUSION_SPI is not set

# CONFIG_FUSION_FC is not set

# CONFIG_FUSION_SAS is not set



#

# IEEE 1394 (FireWire) support

#

# CONFIG_FIREWIRE is not set

# CONFIG_IEEE1394 is not set



#

# I2O device support

#

# CONFIG_I2O is not set



#

# Network device support

#

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_IP1000 is not set

# CONFIG_ARCNET is not set

# CONFIG_PHYLIB is not set



#

# Ethernet (10 or 100Mbit)

#

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_AX88796=y

CONFIG_AX88796_93CX6=y

# CONFIG_STNIC is not set

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_SMC91X is not set



#

# Tulip family network device support

#

# CONFIG_SMC911X is not set

# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

CONFIG_NET_PCI=y

CONFIG_PCNET32=m

# CONFIG_PCNET32_NAPI is not set
@@ -621,7 +565,6 @@ CONFIG_PCNET32=m 
# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

# CONFIG_DGRS is not set

# CONFIG_EEPRO100 is not set

# CONFIG_E100 is not set

# CONFIG_FEALNX is not set
@@ -647,6 +590,7 @@ CONFIG_NETDEV_1000=y 
CONFIG_E1000=m

# CONFIG_E1000_NAPI is not set

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_E1000E is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -664,11 +608,14 @@ CONFIG_R8169=y 
CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

# CONFIG_NIU is not set

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_TR is not set



#
@@ -686,15 +633,7 @@ CONFIG_NETDEV_10000=y 
# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem

#

# CONFIG_ISDN is not set



#

# Telephony Support

#

# CONFIG_PHONE is not set



#
@@ -702,6 +641,7 @@ CONFIG_NETDEV_10000=y 
#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set



#

# Userland interfaces
@@ -711,7 +651,6 @@ CONFIG_INPUT_MOUSEDEV=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set
@@ -765,21 +704,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256



#

# IPMI

#

# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

CONFIG_HW_RANDOM=y

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_DRM is not set

# CONFIG_RAW_DRIVER is not set



#

# TPM devices

#

# CONFIG_TCG_TPM is not set

CONFIG_DEVPORT=y

# CONFIG_I2C is not set
@@ -789,21 +718,31 @@ CONFIG_DEVPORT=y 
#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers
@@ -820,14 +759,16 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

# CONFIG_FB is not set



#

# Sound
@@ -843,20 +784,14 @@ CONFIG_SOUND=m 
# Open Sound System

#

CONFIG_SOUND_PRIME=m

# CONFIG_OSS_OBSOLETE is not set

# CONFIG_SOUND_TRIDENT is not set

# CONFIG_SOUND_MSNDCLAS is not set

# CONFIG_SOUND_MSNDPIN is not set



#

# HID Devices

#

CONFIG_HID_SUPPORT=y

CONFIG_HID=y

# CONFIG_HID_DEBUG is not set



#

# USB support

#

# CONFIG_HIDRAW is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y
@@ -871,32 +806,8 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# Real Time Clock

#

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_HCTOSYS=y
@@ -912,10 +823,6 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

# CONFIG_RTC_DRV_TEST is not set



#

# I2C RTC drivers

#



#

# SPI RTC drivers

#
@@ -924,8 +831,10 @@ CONFIG_RTC_INTF_DEV=y 
# Platform RTC drivers

#

# CONFIG_RTC_DRV_DS1553 is not set

# CONFIG_RTC_DRV_STK17TA8 is not set

# CONFIG_RTC_DRV_DS1742 is not set

# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T59 is not set

# CONFIG_RTC_DRV_V3020 is not set



#
@@ -934,17 +843,9 @@ CONFIG_RTC_INTF_DEV=y 
CONFIG_RTC_DRV_SH=y



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

# Userspace I/O

#

# CONFIG_UIO is not set



#

# File systems
@@ -1005,7 +906,6 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

CONFIG_CONFIGFS_FS=m



#
@@ -1024,10 +924,7 @@ CONFIG_CONFIGFS_FS=m 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set
@@ -1053,17 +950,12 @@ CONFIG_RPCSEC_GSS_KRB5=y 
# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_9P_FS is not set



#

# Partition Types

#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y



#

# Native Language Support

#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

CONFIG_NLS_CODEPAGE_437=y
@@ -1104,23 +996,18 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#

CONFIG_INSTRUMENTATION=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set
@@ -1129,6 +1016,7 @@ CONFIG_DEBUG_FS=y 
CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_DETECT_SOFTLOCKUP=y

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_SLAB is not set
@@ -1137,6 +1025,7 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_LOCK_STAT is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set
@@ -1144,10 +1033,13 @@ CONFIG_DEBUG_BUGVERBOSE=y 
CONFIG_DEBUG_INFO=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_FRAME_POINTER is not set

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

CONFIG_SH_STANDARD_BIOS=y

# CONFIG_EARLY_SCIF_CONSOLE is not set

CONFIG_EARLY_PRINTK=y
@@ -1155,6 +1047,7 @@ CONFIG_EARLY_PRINTK=y 
CONFIG_DEBUG_STACKOVERFLOW=y

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_4KSTACKS is not set

# CONFIG_IRQSTACKS is not set

# CONFIG_SH_KGDB is not set



#
@@ -1162,10 +1055,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set



#

# Cryptographic options

#

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y
@@ -1186,6 +1076,7 @@ CONFIG_CRYPTO_ECB=m 
CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set
@@ -1199,15 +1090,14 @@ CONFIG_CRYPTO_DES=y 
# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set



#

# Hardware crypto devices

#

# CONFIG_CRYPTO_AUTHENC is not set

CONFIG_CRYPTO_HW=y



#

# Library routines
@@ -1217,6 +1107,7 @@ CONFIG_BITREVERSE=y 
# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

arch/sh/configs/r7785rp_defconfig

+5 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc1

# Fri Nov  2 14:30:49 2007

# Linux kernel version: 2.6.24-rc2

# Tue Nov 13 20:34:57 2007

#

CONFIG_SUPERH=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -124,8 +124,6 @@ CONFIG_CPU_SHX2=y 
# CONFIG_CPU_SUBTYPE_SH7751R is not set

# CONFIG_CPU_SUBTYPE_SH7760 is not set

# CONFIG_CPU_SUBTYPE_SH4_202 is not set

# CONFIG_CPU_SUBTYPE_ST40STB1 is not set

# CONFIG_CPU_SUBTYPE_ST40GX1 is not set

# CONFIG_CPU_SUBTYPE_SH7770 is not set

# CONFIG_CPU_SUBTYPE_SH7780 is not set

CONFIG_CPU_SUBTYPE_SH7785=y
@@ -254,7 +252,6 @@ CONFIG_GUSA=y 
#

CONFIG_ZERO_PAGE_OFFSET=0x00001000

CONFIG_BOOT_LINK_OFFSET=0x00800000

# CONFIG_UBC_WAKEUP is not set

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
@@ -266,6 +263,7 @@ CONFIG_SH_PCIDMA_NONCOHERENT=y 
CONFIG_PCI_AUTO=y

CONFIG_PCI_AUTO_UPDATE_RESOURCES=y

# CONFIG_ARCH_SUPPORTS_MSI is not set

CONFIG_PCI_LEGACY=y

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCCARD is not set

# CONFIG_HOTPLUG_PCI is not set
@@ -550,6 +548,8 @@ CONFIG_NETDEVICES=y 
# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_AX88796=y

CONFIG_AX88796_93CX6=y

# CONFIG_STNIC is not set

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set

arch/sh/mm/fault.c

+7 −26
Original line number Diff line number Diff line
@@ -258,9 +258,6 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs, 
	pmd_t *pmd;

	pte_t *pte;

	pte_t entry;

	struct mm_struct *mm = current->mm;

	spinlock_t *ptl = NULL;

	int ret = 1;



#ifdef CONFIG_SH_KGDB

	if (kgdb_nofault && kgdb_bus_err_hook)
@@ -274,12 +271,11 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs, 
	 */

	if (address >= P3SEG && address < P3_ADDR_MAX) {

		pgd = pgd_offset_k(address);

		mm = NULL;

	} else {

		if (unlikely(address >= TASK_SIZE || !mm))

		if (unlikely(address >= TASK_SIZE || !current->mm))

			return 1;



		pgd = pgd_offset(mm, address);

		pgd = pgd_offset(current->mm, address);

	}



	pud = pud_offset(pgd, address);
@@ -289,34 +285,19 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs, 
	if (pmd_none_or_clear_bad(pmd))

		return 1;



	if (mm)

		pte = pte_offset_map_lock(mm, pmd, address, &ptl);

	else

	pte = pte_offset_kernel(pmd, address);



	entry = *pte;

	if (unlikely(pte_none(entry) || pte_not_present(entry)))

		goto unlock;

		return 1;

	if (unlikely(writeaccess && !pte_write(entry)))

		goto unlock;

		return 1;



	if (writeaccess)

		entry = pte_mkdirty(entry);

	entry = pte_mkyoung(entry);



#ifdef CONFIG_CPU_SH4

	/*

	 * ITLB is not affected by "ldtlb" instruction.

	 * So, we need to flush the entry by ourselves.

	 */

	local_flush_tlb_one(get_asid(), address & PAGE_MASK);

#endif



	set_pte(pte, entry);

	update_mmu_cache(NULL, address, entry);

	ret = 0;

unlock:

	if (mm)

		pte_unmap_unlock(pte, ptl);

	return ret;



	return 0;

}