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

Commit 33d444f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Wire up signalfd/timerfd/eventfd syscalls.
  [SPARC64]: Add support for bq4802 TOD chip, as found on ultra45.
  [SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset.
  [SPARC64]: envctrl.c needs asm/io.h
  [SPARC64]: Update defconfig.
  [TTY]: Export proc_clear_tty() to modulea.
  [SPARC64]: pci_resource_adjust() cannot be __init.
  [SPARC64]: Spelling fixes.
  [SPARC]: Spelling fixes.
  [SPARC64]: Kill LARGE_ALLOCS and update defconfig.
parents ae7d5c86 8354c5b7

arch/sparc/kernel/auxio.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off) 
		break;

	case sun4m:

		if(!auxio_register)

			break;     /* VME chassic sun4m, no auxio. */

			break;     /* VME chassis sun4m, no auxio. */

		regval = sbus_readb(auxio_register);

		sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN4M,

			auxio_register);

arch/sparc/kernel/ioport.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba) 
 * size must be the same as what as passed into pci_alloc_consistent,

 * and likewise dma_addr must be the same as what *dma_addrp was set to.

 *

 * References to the memory and mappings assosciated with cpu_addr/dma_addr

 * References to the memory and mappings associated with cpu_addr/dma_addr

 * past this call are illegal.

 */

void pci_free_consistent(struct pci_dev *pdev, size_t n, void *p, dma_addr_t ba)

arch/sparc/kernel/irq.c

+4 −4
Original line number Diff line number Diff line 
/*  $Id: irq.c,v 1.114 2001/12/11 04:55:51 davem Exp $

 *  arch/sparc/kernel/irq.c:  Interrupt request handling routines. On the

 *                            Sparc the IRQ's are basically 'cast in stone'

 *                            Sparc the IRQs are basically 'cast in stone'

 *                            and you are supposed to probe the prom's device

 *                            node trees to find out who's got which IRQ.

 *
@@ -330,7 +330,7 @@ void handler_irq(int irq, struct pt_regs * regs) 
	irq_enter();

	disable_pil_irq(irq);

#ifdef CONFIG_SMP

	/* Only rotate on lower priority IRQ's (scsi, ethernet, etc.). */

	/* Only rotate on lower priority IRQs (scsi, ethernet, etc.). */

	if((sparc_cpu_model==sun4m) && (irq < 10))

		smp4m_irq_rotate(cpu);

#endif
@@ -371,7 +371,7 @@ void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) 
}

#endif



/* Fast IRQ's on the Sparc can only have one routine attached to them,

/* Fast IRQs on the Sparc can only have one routine attached to them,

 * thus no sharing possible.

 */

int request_fast_irq(unsigned int irq,
@@ -608,7 +608,7 @@ void __init init_IRQ(void) 
		break;



	default:

		prom_printf("Cannot initialize IRQ's on this Sun machine...");

		prom_printf("Cannot initialize IRQs on this Sun machine...");

		break;

	}

	btfixup();

arch/sparc/kernel/pcic.c

+2 −2
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ void __init pci_time_init(void) 
static __inline__ unsigned long do_gettimeoffset(void)

{

	/*

	 * We devide all to 100

	 * We divide all by 100

	 * to have microsecond resolution and to avoid overflow

	 */

	unsigned long count =
@@ -956,7 +956,7 @@ EXPORT_SYMBOL(pci_device_to_OF_node); 
 * Also, think for a moment about likes of floppy.c that

 * include architecture specific parts. They may want to redefine ins/outs.

 *

 * We do not use horroble macroses here because we want to

 * We do not use horrible macros here because we want to

 * advance pointer by sizeof(size).

 */

void outsb(unsigned long addr, const void *src, unsigned long count)

arch/sparc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs) 
 * NOTE! Only a kernel-only process(ie the swapper or direct descendants

 * who haven't done an "execve()") should use this: it will work within

 * a system call from a "real" process, but the process memory space will

 * not be free'd until both the parent and the child have exited.

 * not be freed until both the parent and the child have exited.

 */

pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)

{