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

Commit b6250e37 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: landisk board build fixes. 



Get the landisk board building again..

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 31ccb081

arch/sh/boards/landisk/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
 */

#include <linux/init.h>

#include <linux/irq.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <asm/landisk/iodata_landisk.h>



static void enable_landisk_irq(unsigned int irq);

arch/sh/configs/landisk_defconfig

+54 −31
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18

# Tue Oct  3 11:14:13 2006

# Linux kernel version: 2.6.19

# Thu Dec  7 17:13:04 2006

#

CONFIG_SUPERH=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -10,6 +10,9 @@ CONFIG_GENERIC_HWEIGHT=y 
CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

# CONFIG_GENERIC_TIME is not set

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

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



#
@@ -33,6 +36,7 @@ CONFIG_SYSVIPC=y 
# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -114,6 +118,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
CONFIG_SH_LANDISK=y

# CONFIG_SH_TITAN is not set

# CONFIG_SH_SHMIN is not set

# CONFIG_SH_7206_SOLUTION_ENGINE is not set

# CONFIG_SH_7619_SOLUTION_ENGINE is not set

# CONFIG_SH_UNKNOWN is not set



#
@@ -125,6 +131,12 @@ CONFIG_CPU_SH4=y 
# SH-2 Processor Support

#

# CONFIG_CPU_SUBTYPE_SH7604 is not set

# CONFIG_CPU_SUBTYPE_SH7619 is not set



#

# SH-2A Processor Support

#

# CONFIG_CPU_SUBTYPE_SH7206 is not set



#

# SH-3 Processor Support
@@ -160,6 +172,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y 
#

# CONFIG_CPU_SUBTYPE_SH7770 is not set

# CONFIG_CPU_SUBTYPE_SH7780 is not set

# CONFIG_CPU_SUBTYPE_SH7785 is not set



#

# SH4AL-DSP Processor Support
@@ -175,6 +188,9 @@ CONFIG_PAGE_OFFSET=0x80000000 
CONFIG_MEMORY_START=0x0c000000

CONFIG_MEMORY_SIZE=0x04000000

CONFIG_VSYSCALL=y

CONFIG_PAGE_SIZE_4KB=y

# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_64KB is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -196,16 +212,21 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 
# Processor features

#

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

CONFIG_CPU_HAS_INTEVT=y

CONFIG_CPU_HAS_IPR_IRQ=y

CONFIG_CPU_HAS_SR_RB=y

CONFIG_CPU_HAS_PTEA=y



#

# Timer support

#

CONFIG_SH_TMU=y

CONFIG_SH_TIMER_IRQ=16

# CONFIG_NO_IDLE_HZ is not set

CONFIG_SH_PCLK_FREQ=33333333



#
@@ -216,9 +237,7 @@ CONFIG_SH_PCLK_FREQ=33333333 
#

# DMA support

#

CONFIG_SH_DMA=y

CONFIG_NR_ONCHIP_DMA_CHANNELS=4

# CONFIG_NR_DMA_CHANNELS_BOOL is not set

# CONFIG_SH_DMA is not set



#

# Companion Chips
@@ -226,6 +245,11 @@ CONFIG_NR_ONCHIP_DMA_CHANNELS=4 
# CONFIG_HD6446X_SERIES is not set

CONFIG_HEARTBEAT=y



#

# Additional SuperH Device Drivers

#

# CONFIG_PUSH_SWITCH is not set



#

# Kernel features

#
@@ -340,11 +364,13 @@ CONFIG_IP_PNP=y 
# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set



#

# IP: Virtual Server Configuration
@@ -361,24 +387,12 @@ CONFIG_NETFILTER=y 
# Core Netfilter Configuration

#

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_NF_CONNTRACK_ENABLED is not set

# CONFIG_NETFILTER_XTABLES is not set



#

# IP: Netfilter Configuration

#

CONFIG_IP_NF_CONNTRACK=m

CONFIG_IP_NF_CT_ACCT=y

CONFIG_IP_NF_CONNTRACK_MARK=y

# CONFIG_IP_NF_CONNTRACK_EVENTS is not set

# CONFIG_IP_NF_CT_PROTO_SCTP is not set

CONFIG_IP_NF_FTP=m

CONFIG_IP_NF_IRC=m

# CONFIG_IP_NF_NETBIOS_NS is not set

CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

# CONFIG_IP_NF_SIP is not set

CONFIG_IP_NF_QUEUE=m



#
@@ -476,6 +490,12 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 
# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set



#

# ATA/ATAPI/MFM/RLL support

#
@@ -519,6 +539,7 @@ CONFIG_BLK_DEV_AEC62XX=y 
# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_JMICRON is not set

# CONFIG_BLK_DEV_SC1200 is not set

# CONFIG_BLK_DEV_PIIX is not set

# CONFIG_BLK_DEV_IT821X is not set
@@ -542,6 +563,7 @@ CONFIG_IDEDMA_AUTO=y 
#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

# CONFIG_SCSI_TGT is not set

# CONFIG_SCSI_NETLINK is not set

CONFIG_SCSI_PROC_FS=y
@@ -561,6 +583,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_SCSI_MULTI_LUN=y

# CONFIG_SCSI_CONSTANTS is not set

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set



#

# SCSI Transports
@@ -602,12 +625,12 @@ CONFIG_SCSI_MULTI_LUN=y 
# CONFIG_SCSI_NCR53C406A is not set

# CONFIG_SCSI_STEX is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_PAS16 is not set

# CONFIG_SCSI_PSI240I is not set

# CONFIG_SCSI_QLOGIC_FAS is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_QLA_ISCSI is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_SYM53C416 is not set

# CONFIG_SCSI_DC395x is not set
@@ -615,6 +638,7 @@ CONFIG_SCSI_MULTI_LUN=y 
# CONFIG_SCSI_T128 is not set

# CONFIG_SCSI_NSP32 is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SRP is not set



#

# PCMCIA SCSI adapter support
@@ -757,6 +781,7 @@ CONFIG_8139CP=y 
# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set



#

# Token Ring devices
@@ -871,10 +896,6 @@ CONFIG_HW_RANDOM=y 
# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set



#

# Ftape, the floppy tape device driver

#

# CONFIG_DRM is not set



#
@@ -889,7 +910,6 @@ CONFIG_HW_RANDOM=y 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -905,6 +925,7 @@ CONFIG_HW_RANDOM=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support
@@ -916,10 +937,6 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_VT1211 is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices

#



#

# Multimedia devices

#
@@ -1037,6 +1054,7 @@ CONFIG_USB=y 
CONFIG_USB_DEVICEFS=y

# CONFIG_USB_BANDWIDTH is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_MULTITHREAD_PROBE is not set

# CONFIG_USB_OTG is not set



#
@@ -1106,7 +1124,6 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set

# CONFIG_USB_TRANCEVIBRATOR is not set



#

# USB Imaging devices
@@ -1121,6 +1138,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_KAWETH is not set

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

# CONFIG_USB_USBNET_MII is not set

# CONFIG_USB_USBNET is not set

CONFIG_USB_MON=y
@@ -1156,6 +1174,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m 
# CONFIG_USB_SERIAL_KLSI is not set

# CONFIG_USB_SERIAL_KOBIL_SCT is not set

# CONFIG_USB_SERIAL_MCT_U232 is not set

# CONFIG_USB_SERIAL_MOS7720 is not set

# CONFIG_USB_SERIAL_MOS7840 is not set

# CONFIG_USB_SERIAL_NAVMAN is not set

CONFIG_USB_SERIAL_PL2303=m
@@ -1167,6 +1186,7 @@ CONFIG_USB_SERIAL_PL2303=m 
# CONFIG_USB_SERIAL_XIRCOM is not set

# CONFIG_USB_SERIAL_OPTION is not set

# CONFIG_USB_SERIAL_OMNINET is not set

# CONFIG_USB_SERIAL_DEBUG is not set



#

# USB Miscellaneous drivers
@@ -1188,6 +1208,7 @@ CONFIG_USB_EMI26=m 
CONFIG_USB_SISUSBVGA=m

CONFIG_USB_SISUSBVGA_CON=y

# CONFIG_USB_LD is not set

# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_TEST is not set



#
@@ -1254,6 +1275,7 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set

# CONFIG_EXT4DEV_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y
@@ -1264,6 +1286,7 @@ CONFIG_REISERFS_FS=y 
# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y
@@ -1414,6 +1437,7 @@ CONFIG_NLS_CODEPAGE_932=y 
#

# Kernel hacking

#

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

# CONFIG_MAGIC_SYSRQ is not set
@@ -1422,6 +1446,7 @@ CONFIG_ENABLE_MUST_CHECK=y 
CONFIG_LOG_BUF_SHIFT=14

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_SH_STANDARD_BIOS=y

# CONFIG_EARLY_SCIF_CONSOLE is not set

# CONFIG_EARLY_PRINTK is not set
@@ -1445,6 +1470,4 @@ CONFIG_SH_STANDARD_BIOS=y 
# CONFIG_CRC16 is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_PLIST=y

include/asm-sh/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ extern void update_mmu_cache(struct vm_area_struct * vma, 
#else

#define __swp_type(x)			((x).val & 0xff)

#define __swp_offset(x)			((x).val >> 10)

#define __swp_entry(type, offset)	((swp_entry_t){(type) | (offset) <<10)})

#define __swp_entry(type, offset)	((swp_entry_t){(type) | (offset) <<10})



#define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) >> 1 })

#define __swp_entry_to_pte(x)		((pte_t) { (x).val << 1 })