Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k (ba2e1c5f) · Commits · 戴 / test

arch/m68k/amiga/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,6 @@
		# Makefile for Linux arch/m68k/amiga source directory
		#

		obj-y := config.o amiints.o cia.o chipram.o amisound.o
		obj-y := config.o amiints.o cia.o chipram.o amisound.o platform.o

		obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o

arch/m68k/amiga/platform.c

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007-2009 Geert Uytterhoeven
		*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file COPYING in the main directory of this archive
		* for more details.
		*/

		#include <linux/init.h>
		#include <linux/platform_device.h>
		#include <linux/zorro.h>

		#include <asm/amigahw.h>


		#ifdef CONFIG_ZORRO

		static const struct resource zorro_resources[] __initconst = {
		/* Zorro II regions (on Zorro II/III) */
		{
		.name = "Zorro II exp",
		.start = 0x00e80000,
		.end = 0x00efffff,
		.flags = IORESOURCE_MEM,
		}, {
		.name = "Zorro II mem",
		.start = 0x00200000,
		.end = 0x009fffff,
		.flags = IORESOURCE_MEM,
		},
		/* Zorro III regions (on Zorro III only) */
		{
		.name = "Zorro III exp",
		.start = 0xff000000,
		.end = 0xffffffff,
		.flags = IORESOURCE_MEM,
		}, {
		.name = "Zorro III cfg",
		.start = 0x40000000,
		.end = 0x7fffffff,
		.flags = IORESOURCE_MEM,
		}
		};


		static int __init amiga_init_bus(void)
		{
		if (!MACH_IS_AMIGA \|\| !AMIGAHW_PRESENT(ZORRO))
		return -ENODEV;

		platform_device_register_simple("amiga-zorro", -1, zorro_resources,
		AMIGAHW_PRESENT(ZORRO3) ? 4 : 2);
		return 0;
		}

		subsys_initcall(amiga_init_bus);

		#endif /* CONFIG_ZORRO */


		static int __init amiga_init_devices(void)
		{
		if (!MACH_IS_AMIGA)
		return -ENODEV;

		/* video hardware */
		if (AMIGAHW_PRESENT(AMI_VIDEO))
		platform_device_register_simple("amiga-video", -1, NULL, 0);


		/* sound hardware */
		if (AMIGAHW_PRESENT(AMI_AUDIO))
		platform_device_register_simple("amiga-audio", -1, NULL, 0);


		/* storage interfaces */
		if (AMIGAHW_PRESENT(AMI_FLOPPY))
		platform_device_register_simple("amiga-floppy", -1, NULL, 0);

		return 0;
		}

		device_initcall(amiga_init_devices);

arch/m68k/bvme6000/rtc.c

+9 −20

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@
		#include <linux/types.h>
		#include <linux/errno.h>
		#include <linux/miscdevice.h>
		#include <linux/smp_lock.h>
		#include <linux/ioport.h>
		#include <linux/capability.h>
		#include <linux/fcntl.h>
		@@ -35,10 +34,9 @@
		static unsigned char days_in_mo[] =
		{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};

		static char rtc_status;
		static atomic_t rtc_status = ATOMIC_INIT(1);

		static int rtc_ioctl(struct inode inode, struct file file, unsigned int cmd,
		unsigned long arg)
		static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		{
		volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;
		unsigned char msr;
		@@ -133,28 +131,19 @@ static int rtc_ioctl(struct inode inode, struct file file, unsigned int cmd,

		/*
		* We enforce only one user at a time here with the open/close.
		* Also clear the previous interrupt data on an open, and clean
		* up things on a close.
		*/

		static int rtc_open(struct inode inode, struct file file)
		{
		lock_kernel();
		if(rtc_status) {
		unlock_kernel();
		if (!atomic_dec_and_test(&rtc_status)) {
		atomic_inc(&rtc_status);
		return -EBUSY;
		}

		rtc_status = 1;
		unlock_kernel();
		return 0;
		}

		static int rtc_release(struct inode inode, struct file file)
		{
		lock_kernel();
		rtc_status = 0;
		unlock_kernel();
		atomic_inc(&rtc_status);
		return 0;
		}

		@@ -163,7 +152,7 @@ static int rtc_release(struct inode inode, struct file file)
		*/

		static const struct file_operations rtc_fops = {
		.ioctl = rtc_ioctl,
		.unlocked_ioctl = rtc_ioctl,
		.open = rtc_open,
		.release = rtc_release,
		};

arch/m68k/hp300/time.h

+1 −3

Original line number	Diff line number	Diff line
		extern void hp300_sched_init(irq_handler_t vector);
		extern unsigned long hp300_gettimeoffset(void);

arch/m68k/include/asm/bitops_mm.h

+8 −6

Original line number	Diff line number	Diff line
		@@ -365,6 +365,10 @@ static inline int minix_test_bit(int nr, const void *vaddr)
		#define ext2_set_bit_atomic(lock, nr, addr) test_and_set_bit((nr) ^ 24, (unsigned long *)(addr))
		#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
		#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
		#define ext2_find_next_zero_bit(addr, size, offset) \
		generic_find_next_zero_le_bit((unsigned long *)addr, size, offset)
		#define ext2_find_next_bit(addr, size, offset) \
		generic_find_next_le_bit((unsigned long *)addr, size, offset)

		static inline int ext2_test_bit(int nr, const void *vaddr)
		{
		@@ -394,10 +398,9 @@ static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size)
		return (p - addr) * 32 + res;
		}

		static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,
		unsigned offset)
		static inline unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
		unsigned long size, unsigned long offset)
		{
		const unsigned long *addr = vaddr;
		const unsigned long *p = addr + (offset >> 5);
		int bit = offset & 31UL, res;

		@@ -437,10 +440,9 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size)
		return (p - addr) * 32 + res;
		}

		static inline int ext2_find_next_bit(const void *vaddr, unsigned size,
		unsigned offset)
		static inline unsigned long generic_find_next_le_bit(const unsigned long *addr,
		unsigned long size, unsigned long offset)
		{
		const unsigned long *addr = vaddr;
		const unsigned long *p = addr + (offset >> 5);
		int bit = offset & 31UL, res;

Admin message