Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (1a3f2ea3) · Commits · 戴 / test

arch/sparc/kernel/entry.S

+3 −4

Original line number	Diff line number	Diff line
		/* $Id: entry.S,v 1.170 2001/11/13 00:57:05 davem Exp $
		* arch/sparc/kernel/entry.S: Sparc trap low-level entry points.
		/* arch/sparc/kernel/entry.S: Sparc trap low-level entry points.
		*
		* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
		* Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net)
		* Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
		* Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
		* Copyright (C) 1996-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
		@@ -129,7 +128,7 @@ trap_low:
		RESTORE_ALL
		#endif

		#ifdef CONFIG_BLK_DEV_FD
		#if defined(CONFIG_BLK_DEV_FD) \|\| defined(CONFIG_BLK_DEV_FD_MODULE)
		.text
		.align 4
		.globl floppy_hardint

arch/sparc/kernel/irq.c

+59 −25

Original line number	Diff line number	Diff line
		@@ -351,33 +351,13 @@ void handler_irq(int irq, struct pt_regs * regs)
		set_irq_regs(old_regs);
		}

		#ifdef CONFIG_BLK_DEV_FD
		extern void floppy_interrupt(int irq, void *dev_id);

		void sparc_floppy_irq(int irq, void dev_id, struct pt_regs regs)
		{
		struct pt_regs *old_regs;
		int cpu = smp_processor_id();

		old_regs = set_irq_regs(regs);
		disable_pil_irq(irq);
		irq_enter();
		kstat_cpu(cpu).irqs[irq]++;
		floppy_interrupt(irq, dev_id);
		irq_exit();
		enable_pil_irq(irq);
		set_irq_regs(old_regs);
		// XXX Eek, it's totally changed with preempt_count() and such
		// if (softirq_pending(cpu))
		// do_softirq();
		}
		#endif
		#if defined(CONFIG_BLK_DEV_FD) \|\| defined(CONFIG_BLK_DEV_FD_MODULE)

		/* Fast IRQs on the Sparc can only have one routine attached to them,
		* thus no sharing possible.
		*/
		int request_fast_irq(unsigned int irq,
		irq_handler_t handler,
		static int request_fast_irq(unsigned int irq,
		void (*handler)(void),
		unsigned long irqflags, const char *devname)
		{
		struct irqaction *action;
		@@ -457,7 +437,6 @@ int request_fast_irq(unsigned int irq,
		*/
		flush_cache_all();

		action->handler = handler;
		action->flags = irqflags;
		cpus_clear(action->mask);
		action->name = devname;
		@@ -475,6 +454,61 @@ out:
		return ret;
		}

		/* These variables are used to access state from the assembler
		* interrupt handler, floppy_hardint, so we cannot put these in
		* the floppy driver image because that would not work in the
		* modular case.
		*/
		volatile unsigned char *fdc_status;
		EXPORT_SYMBOL(fdc_status);

		char *pdma_vaddr;
		EXPORT_SYMBOL(pdma_vaddr);

		unsigned long pdma_size;
		EXPORT_SYMBOL(pdma_size);

		volatile int doing_pdma;
		EXPORT_SYMBOL(doing_pdma);

		char *pdma_base;
		EXPORT_SYMBOL(pdma_base);

		unsigned long pdma_areasize;
		EXPORT_SYMBOL(pdma_areasize);

		extern void floppy_hardint(void);

		static irqreturn_t (floppy_irq_handler)(int irq, void dev_id);

		void sparc_floppy_irq(int irq, void dev_id, struct pt_regs regs)
		{
		struct pt_regs *old_regs;
		int cpu = smp_processor_id();

		old_regs = set_irq_regs(regs);
		disable_pil_irq(irq);
		irq_enter();
		kstat_cpu(cpu).irqs[irq]++;
		floppy_irq_handler(irq, dev_id);
		irq_exit();
		enable_pil_irq(irq);
		set_irq_regs(old_regs);
		// XXX Eek, it's totally changed with preempt_count() and such
		// if (softirq_pending(cpu))
		// do_softirq();
		}

		int sparc_floppy_request_irq(int irq, unsigned long flags,
		irqreturn_t (irq_handler)(int irq, void ))
		{
		floppy_irq_handler = irq_handler;
		return request_fast_irq(irq, floppy_hardint, flags, "floppy");
		}
		EXPORT_SYMBOL(sparc_floppy_request_irq);

		#endif

		int request_irq(unsigned int irq,
		irq_handler_t handler,
		unsigned long irqflags, const char * devname, void *dev_id)

arch/sparc/kernel/sparc_ksyms.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,6 @@ EXPORT_SYMBOL(mstk48t02_regs);
		EXPORT_SYMBOL(set_auxio);
		EXPORT_SYMBOL(get_auxio);
		#endif
		EXPORT_SYMBOL(request_fast_irq);
		EXPORT_SYMBOL(io_remap_pfn_range);
		/* P3: iounit_xxx may be needed, sun4d users */
		/* EXPORT_SYMBOL(iounit_map_dma_init); */

drivers/video/cg6.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -677,6 +677,7 @@ static int __devinit cg6_probe(struct of_device op, const struct of_device_id
		struct fb_info *info;
		struct cg6_par *par;
		int linebytes, err;
		int dblbuf;

		info = framebuffer_alloc(sizeof(struct cg6_par), &op->dev);

		@@ -698,7 +699,9 @@ static int __devinit cg6_probe(struct of_device op, const struct of_device_id
		linebytes = of_getintprop_default(dp, "linebytes",
		info->var.xres);
		par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
		if (of_find_property(dp, "dblbuf", NULL))

		dblbuf = of_getintprop_default(dp, "dblbuf", 0);
		if (dblbuf)
		par->fbsize *= 4;

		par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET,

include/asm-sparc/fcntl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#define O_LARGEFILE 0x40000
		#define O_DIRECT 0x100000 /* direct disk access hint */
		#define O_NOATIME 0x200000
		#define O_CLOEXEC 0x400000

		#define F_GETOWN 5 /* for sockets. */
		#define F_SETOWN 6 /* for sockets. */
		@@ -31,6 +32,5 @@
		#define __ARCH_FLOCK_PAD short __unused;
		#define __ARCH_FLOCK64_PAD short __unused;

		#include <asm-generic/fcntl.h>

		#endif

Admin message