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

Commit 835a906c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Add .gitignore entry for syscalltab.
  sh64: generic quicklist support.
  sh64: Update cayman defconfig.
  sh64: Fixup sh-sci build.
  sh64: ppoll/pselect6() and restartable syscalls.
  sh64: dma-mapping updates.
  sh64: Fixups for the irq_regs changes.
  sh64: Wire up many new syscalls.
  spelling fixes: arch/sh64/
  sh64: ROUND_UP macro cleanup in arch/sh64/kernel/pci_sh5.c
parents e089d43f 51a41e7d

arch/sh64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ config MMU 
	bool

	default y



config QUICKLIST

	def_bool y



config RWSEM_GENERIC_SPINLOCK

	bool

	default y

arch/sh64/configs/cayman_defconfig

+121 −78
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18

# Tue Oct  3 13:30:51 2006

# Linux kernel version: 2.6.22-rc1

# Mon May 14 08:43:31 2007

#

CONFIG_SUPERH=y

CONFIG_SUPERH64=y
@@ -10,6 +10,8 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

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



#
@@ -33,13 +35,15 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

# CONFIG_SYSCTL_SYSCALL is not set

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -49,14 +53,19 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support
@@ -135,7 +144,7 @@ CONFIG_SH64_ID2815_WORKAROUND=y 
#

CONFIG_HEARTBEAT=y

CONFIG_HDSP253_LED=y

CONFIG_SH_DMA=y

# CONFIG_SH_DMA is not set

CONFIG_PREEMPT=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y
@@ -146,23 +155,20 @@ CONFIG_FLAT_NODE_MEM_MAP=y 
# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0



#

# Bus options (PCI, PCMCIA, EISA, MCA, ISA)

#

CONFIG_PCI=y

CONFIG_SH_PCIDMA_NONCOHERENT=y

# CONFIG_PCI_MULTITHREAD_PROBE is not set

# CONFIG_ARCH_SUPPORTS_MSI is not set

# CONFIG_PCI_DEBUG is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#

# PCI Hotplug Support

#

# CONFIG_HOTPLUG_PCI is not set



#
@@ -180,13 +186,13 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -207,11 +213,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

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set
@@ -256,7 +264,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set



#

# Device Drivers
@@ -269,16 +286,13 @@ CONFIG_STANDALONE=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# 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



#

# Memory Technology Devices (MTD)

#

# CONFIG_MTD is not set



#
@@ -289,6 +303,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

# Plug and Play support

#

# CONFIG_PNPACPI is not set



#

# Block devices
@@ -306,10 +321,17 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_PHANTOM is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_BLINK is not set



#

# ATA/ATAPI/MFM/RLL support

#
@@ -320,6 +342,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 
#

# 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
@@ -339,6 +362,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
@@ -378,18 +402,16 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16

CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64

CONFIG_SCSI_SYM53C8XX_MMIO=y

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

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_NSP32 is not set

# CONFIG_SCSI_DEBUG is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

# CONFIG_SCSI_ESP_CORE is not set

# CONFIG_SCSI_SRP is not set

# CONFIG_ATA is not set



#
@@ -408,6 +430,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y 
#

# IEEE 1394 (FireWire) support

#

# CONFIG_FIREWIRE is not set

# CONFIG_IEEE1394 is not set



#
@@ -428,10 +451,6 @@ CONFIG_NETDEVICES=y 
# ARCnet devices

#

# CONFIG_ARCNET is not set



#

# PHY device support

#

# CONFIG_PHYLIB is not set



#
@@ -479,10 +498,8 @@ CONFIG_NET_PCI=y 
# CONFIG_SUNDANCE is not set

# CONFIG_TLAN is not set

# CONFIG_VIA_RHINE is not set



#

# Ethernet (1000 Mbit)

#

# CONFIG_SC92031 is not set

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

# CONFIG_E1000 is not set
@@ -498,14 +515,16 @@ CONFIG_NET_PCI=y 
# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

# CONFIG_QLA3XXX is not set



#

# Ethernet (10000 Mbit)

#

# CONFIG_ATL1 is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

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

CONFIG_MLX4_DEBUG=y



#

# Token Ring devices
@@ -513,13 +532,10 @@ CONFIG_NET_PCI=y 
# CONFIG_TR is not set



#

# Wireless LAN (non-hamradio)

#

# CONFIG_NET_RADIO is not set



#

# Wan interfaces

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_WAN is not set

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set
@@ -571,9 +587,17 @@ CONFIG_KEYBOARD_ATKBD=y 
# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

CONFIG_MOUSE_PS2_ALPS=y

CONFIG_MOUSE_PS2_LOGIPS2PP=y

CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

# CONFIG_MOUSE_SERIAL is not set

# CONFIG_MOUSE_APPLETOUCH is not set

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set
@@ -619,10 +643,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
# IPMI

#

# CONFIG_IPMI_HANDLER is not set



#

# Watchdog Cards

#

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -639,13 +659,8 @@ CONFIG_WATCHDOG=y 
# CONFIG_WDTPCI is not set

CONFIG_HW_RANDOM=y

# CONFIG_GEN_RTC is not set

# 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

# CONFIG_RAW_DRIVER is not set
@@ -653,11 +668,7 @@ CONFIG_HW_RANDOM=y 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support

#

CONFIG_DEVPORT=y

# CONFIG_I2C is not set



#
@@ -669,44 +680,60 @@ CONFIG_HW_RANDOM=y 
#

# Dallas's 1-wire bus

#



#

# Hardware Monitoring support

#

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

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y

# CONFIG_DVB_CORE is not set

CONFIG_DAB=y



#

# Digital Video Broadcasting Devices

# Graphics support

#

# CONFIG_DVB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Graphics support

# Display device support

#

CONFIG_FIRMWARE_EDID=y

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

# CONFIG_FB_DDC is not set

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_SYS_FOPS is not set

CONFIG_FB_DEFERRED_IO=y

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

CONFIG_FB_MODE_HELPERS=y

# CONFIG_FB_TILEBLITTING is not set



#

# Frame buffer hardware drivers

#

# CONFIG_FB_CIRRUS is not set

# CONFIG_FB_PM2 is not set

# CONFIG_FB_CYBER2000 is not set
@@ -720,13 +747,17 @@ CONFIG_FB_MODE_HELPERS=y 
# CONFIG_FB_RADEON is not set

# CONFIG_FB_ATY128 is not set

# CONFIG_FB_ATY is not set

# CONFIG_FB_S3 is not set

# CONFIG_FB_SAVAGE is not set

# CONFIG_FB_SIS is not set

# CONFIG_FB_NEOMAGIC is not set

CONFIG_FB_KYRO=y

# CONFIG_FB_3DFX is not set

# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_VT8623 is not set

# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_ARK is not set

# CONFIG_FB_PM3 is not set

# CONFIG_FB_VIRTUAL is not set



#
@@ -746,10 +777,6 @@ CONFIG_FONT_8x16=y 
# CONFIG_FONT_SUN8x16 is not set

# CONFIG_FONT_SUN12x22 is not set

# CONFIG_FONT_10x18 is not set



#

# Logo configuration

#

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -757,13 +784,18 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_SUPERH_MONO is not set

# CONFIG_LOGO_SUPERH_VGA16 is not set

CONFIG_LOGO_SUPERH_CLUT224=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound

#

# CONFIG_SOUND is not set



#

# HID Devices

#

CONFIG_HID=y

# CONFIG_HID_DEBUG is not set



#

# USB support

#
@@ -780,10 +812,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# USB Gadget Support

#

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#
@@ -836,6 +864,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
@@ -843,6 +872,7 @@ CONFIG_FS_MBCACHE=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=y

CONFIG_ROMFS_FS=y
@@ -912,6 +942,7 @@ CONFIG_LOCKD=y 
CONFIG_LOCKD_V4=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_SUNRPC_BIND34 is not set

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -941,12 +972,18 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_SUN_PARTITION is not set

# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set

# CONFIG_SYSV68_PARTITION is not set



#

# Native Language Support

#

# CONFIG_NLS is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#
@@ -959,28 +996,29 @@ CONFIG_MSDOS_PARTITION=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_DETECT_SOFTLOCKUP=y

CONFIG_SCHEDSTATS=y

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_EARLY_PRINTK is not set

# CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set

CONFIG_SH64_PROC_TLB=y
@@ -1004,10 +1042,15 @@ CONFIG_SH64_SR_WATCH=y 
#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/sh64/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -947,14 +947,14 @@ ret_with_reschedule: 
	! FIXME:!!!

	! no handling of TIF_SYSCALL_TRACE yet!!



	movi	(1 << TIF_NEED_RESCHED), r8

	movi	_TIF_NEED_RESCHED, r8

	and	r8, r7, r8

	pta	work_resched, tr0

	bne	r8, ZERO, tr0



	pta	restore_all, tr1



	movi	(1 << TIF_SIGPENDING), r8

	movi	(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r8

	and	r8, r7, r8

	pta	work_notifysig, tr0

	bne	r8, ZERO, tr0

arch/sh64/kernel/irq.c

+3 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ asmlinkage void do_NMI(unsigned long vector_num, struct pt_regs * regs) 
 */

asmlinkage int do_IRQ(unsigned long vector_num, struct pt_regs * regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

	int irq;



	irq_enter();
@@ -101,13 +102,14 @@ asmlinkage int do_IRQ(unsigned long vector_num, struct pt_regs * regs) 
	irq = irq_demux(vector_num);



	if (irq >= 0) {

		__do_IRQ(irq, regs);

		__do_IRQ(irq);

	} else {

		printk("unexpected IRQ trap at vector %03lx\n", vector_num);

	}



	irq_exit();



	set_irq_regs(old_regs);

	return 1;

}

arch/sh64/kernel/pci_sh5.c

+7 −10
Original line number Diff line number Diff line
@@ -340,8 +340,9 @@ static int __init map_cayman_irq(struct pci_dev *dev, u8 slot, u8 pin) 
	return result;

}



irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t pcish5_err_irq(int irq, void *dev_id)

{

	struct pt_regs *regs = get_irq_regs();

	unsigned pci_int, pci_air, pci_cir, pci_aint;



	pci_int = SH5PCI_READ(INT);
@@ -368,15 +369,13 @@ irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs) 
	return IRQ_HANDLED;

}



irqreturn_t pcish5_serr_irq(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t pcish5_serr_irq(int irq, void *dev_id)

{

	printk("SERR IRQ\n");



	return IRQ_NONE;

}



#define ROUND_UP(x, a)		(((x) + (a) - 1) & ~((a) - 1))



static void __init

pcibios_size_bridge(struct pci_bus *bus, struct resource *ior,

		    struct resource *memr)
@@ -433,8 +432,8 @@ pcibios_size_bridge(struct pci_bus *bus, struct resource *ior, 
	mem_res.end -= mem_res.start;



	/* Align the sizes up by bridge rules */

	io_res.end = ROUND_UP(io_res.end, 4*1024) - 1;

	mem_res.end = ROUND_UP(mem_res.end, 1*1024*1024) - 1;

	io_res.end = ALIGN(io_res.end, 4*1024) - 1;

	mem_res.end = ALIGN(mem_res.end, 1*1024*1024) - 1;



	/* Adjust the bridge's allocation requirements */

	bridge->resource[0].end = bridge->resource[0].start + io_res.end;
@@ -447,18 +446,16 @@ pcibios_size_bridge(struct pci_bus *bus, struct resource *ior, 


	/* adjust parent's resource requirements */

	if (ior) {

		ior->end = ROUND_UP(ior->end, 4*1024);

		ior->end = ALIGN(ior->end, 4*1024);

		ior->end += io_res.end;

	}



	if (memr) {

		memr->end = ROUND_UP(memr->end, 1*1024*1024);

		memr->end = ALIGN(memr->end, 1*1024*1024);

		memr->end += mem_res.end;

	}

}



#undef ROUND_UP



static void __init pcibios_size_bridges(void)

{

	struct resource io_res, mem_res;