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

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

* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix up unsigned syscall_nr in SH-5 pt_regs.
  maple: input: fix up maple mouse driver
  sh: sh7785lcr: fix defconfig for 29-bit mode
parents 9a523d42 ecd4ca52

arch/sh/configs/sh7785lcr_defconfig

+37 −20
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29

# Thu Apr  2 19:15:58 2009

# Linux kernel version: 2.6.30-rc2

# Wed Apr 22 19:17:56 2009

#

CONFIG_SUPERH=y

CONFIG_SUPERH32=y

# CONFIG_SUPERH64 is not set

CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_BUG=y
@@ -79,6 +80,7 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -98,6 +100,7 @@ CONFIG_SLAB=y 
# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

# CONFIG_MARKERS is not set

# CONFIG_OPROFILE is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set
@@ -106,6 +109,8 @@ CONFIG_HAVE_KPROBES=y 
CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_CLK=y

CONFIG_HAVE_DMA_API_DEBUG=y

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -118,7 +123,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -166,6 +170,7 @@ CONFIG_CPU_SHX2=y 
# CONFIG_CPU_SUBTYPE_SH7760 is not set

# CONFIG_CPU_SUBTYPE_SH4_202 is not set

# CONFIG_CPU_SUBTYPE_SH7723 is not set

# CONFIG_CPU_SUBTYPE_SH7724 is not set

# CONFIG_CPU_SUBTYPE_SH7763 is not set

# CONFIG_CPU_SUBTYPE_SH7770 is not set

# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -175,8 +180,6 @@ CONFIG_CPU_SUBTYPE_SH7785=y 
# CONFIG_CPU_SUBTYPE_SH7343 is not set

# CONFIG_CPU_SUBTYPE_SH7722 is not set

# CONFIG_CPU_SUBTYPE_SH7366 is not set

# CONFIG_CPU_SUBTYPE_SH5_101 is not set

# CONFIG_CPU_SUBTYPE_SH5_103 is not set



#

# Memory management options
@@ -186,38 +189,31 @@ CONFIG_MMU=y 
CONFIG_PAGE_OFFSET=0x80000000

CONFIG_MEMORY_START=0x08000000

CONFIG_MEMORY_SIZE=0x08000000

# CONFIG_29BIT is not set

CONFIG_32BIT=y

CONFIG_PMB_ENABLE=y

# CONFIG_PMB is not set

CONFIG_PMB_FIXED=y

CONFIG_29BIT=y

# CONFIG_PMB_ENABLE is not set

# CONFIG_X2TLB is not set

CONFIG_VSYSCALL=y

# CONFIG_NUMA is not set

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_DEFAULT=y

CONFIG_MAX_ACTIVE_REGIONS=2

CONFIG_MAX_ACTIVE_REGIONS=1

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

CONFIG_PAGE_SIZE_4KB=y

# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_16KB is not set

# CONFIG_PAGE_SIZE_64KB is not set

CONFIG_ENTRY_OFFSET=0x00001000

CONFIG_SELECT_MEMORY_MODEL=y

# CONFIG_FLATMEM_MANUAL is not set

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_SPARSEMEM_STATIC=y

# CONFIG_MEMORY_HOTPLUG is not set

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=2
@@ -249,6 +245,7 @@ CONFIG_CPU_HAS_FPU=y 
#

# CONFIG_SH_HIGHLANDER is not set

CONFIG_SH_SH7785LCR=y

CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y



#

# Timer and clock configuration
@@ -672,6 +669,7 @@ CONFIG_NETDEV_1000=y 
# CONFIG_E1000E is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_IGBVF is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -1009,15 +1007,17 @@ CONFIG_USB_HID=y 
#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

# CONFIG_DRAGONRISE_FF is not set

CONFIG_HID_EZKEY=y

# CONFIG_HID_KYE is not set

CONFIG_HID_GYRATION=y

# CONFIG_HID_KENSINGTON is not set

CONFIG_HID_LOGITECH=y

# CONFIG_LOGITECH_FF is not set

# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1218,6 +1218,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set
@@ -1239,6 +1240,11 @@ CONFIG_INOTIFY_USER=y 
# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -1289,6 +1295,7 @@ CONFIG_MINIX_FS=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -1377,6 +1384,9 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set
@@ -1413,6 +1423,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y 
CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers
@@ -1422,9 +1433,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 
# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_DMA_API_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set
@@ -1542,6 +1558,7 @@ CONFIG_CRYPTO_DES=y 
#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

# CONFIG_BINARY_PRINTF is not set



#

# Library routines

arch/sh/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
struct pt_regs {

	unsigned long long pc;

	unsigned long long sr;

	unsigned long long syscall_nr;

	long long syscall_nr;

	unsigned long long regs[63];

	unsigned long long tregs[8];

	unsigned long long pad[2];

drivers/input/mouse/maplemouse.c

+23 −20
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
 *	SEGA Dreamcast mouse driver

 *	Based on drivers/usb/usbmouse.c

 *

 *	Copyright Yaegashi Takeshi, 2001

 *	Adrian McMenamin, 2008

 *	Copyright (c) Yaegashi Takeshi, 2001

 *	Copyright (c) Adrian McMenamin, 2008 - 2009

 */



#include <linux/kernel.h>
@@ -29,7 +29,7 @@ static void dc_mouse_callback(struct mapleq *mq) 
	struct maple_device *mapledev = mq->dev;

	struct dc_mouse *mse = maple_get_drvdata(mapledev);

	struct input_dev *dev = mse->dev;

	unsigned char *res = mq->recvbuf;

	unsigned char *res = mq->recvbuf->buf;



	buttons = ~res[8];

	relx = *(unsigned short *)(res + 12) - 512;
@@ -47,7 +47,7 @@ static void dc_mouse_callback(struct mapleq *mq) 


static int dc_mouse_open(struct input_dev *dev)

{

	struct dc_mouse *mse = dev->dev.platform_data;

	struct dc_mouse *mse = maple_get_drvdata(to_maple_dev(&dev->dev));



	maple_getcond_callback(mse->mdev, dc_mouse_callback, HZ/50,

		MAPLE_FUNC_MOUSE);
@@ -57,29 +57,33 @@ static int dc_mouse_open(struct input_dev *dev) 


static void dc_mouse_close(struct input_dev *dev)

{

	struct dc_mouse *mse = dev->dev.platform_data;

	struct dc_mouse *mse = maple_get_drvdata(to_maple_dev(&dev->dev));



	maple_getcond_callback(mse->mdev, dc_mouse_callback, 0,

		MAPLE_FUNC_MOUSE);

}





/* allow the mouse to be used */

static int __devinit probe_maple_mouse(struct device *dev)

{

	struct maple_device *mdev = to_maple_dev(dev);

	struct maple_driver *mdrv = to_maple_driver(dev->driver);

	int error;

	struct input_dev *input_dev;

	struct dc_mouse *mse;

	int error;



	mse = kzalloc(sizeof(struct dc_mouse), GFP_KERNEL);

	input_dev = input_allocate_device();



	if (!mse || !input_dev) {

	if (!mse) {

		error = -ENOMEM;

		goto fail;

	}



	input_dev = input_allocate_device();

	if (!input_dev) {

		error = -ENOMEM;

		goto fail_nomem;

	}



	mse->dev = input_dev;

	mse->mdev = mdev;
@@ -89,25 +93,24 @@ static int __devinit probe_maple_mouse(struct device *dev) 
		BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);

	input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y) |

		BIT_MASK(REL_WHEEL);

	input_dev->name = mdev->product_name;

	input_dev->id.bustype = BUS_HOST;

	input_dev->open = dc_mouse_open;

	input_dev->close = dc_mouse_close;

	input_dev->name = mdev->product_name;

	input_dev->id.bustype = BUS_HOST;

	error =	input_register_device(input_dev);

	if (error)

		goto fail_register;



	mdev->driver = mdrv;

	maple_set_drvdata(mdev, mse);



	error =	input_register_device(input_dev);

	if (error)

		goto fail;



	return 0;

	return error;



fail:

fail_register:

	input_free_device(input_dev);

	maple_set_drvdata(mdev, NULL);

fail_nomem:

	kfree(mse);

	mdev->driver = NULL;

fail:

	return error;

}