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

Commit 83d3d3c5 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:
  [SPARC32]: Fix sparc32 modpost warnings.
  [SPARC32]: Fix sparc32 modpost warnings with sunzilog
  [SPARC32]: Mark srmmu_nocache_init as __init.
  [SPARC32]: pcic.c needs asm/irq_regs.h
parents 994bd4f9 ab5da288

arch/sparc/kernel/pcic.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/pcic.h>

#include <asm/timer.h>

#include <asm/uaccess.h>

#include <asm/irq_regs.h>





unsigned int pcic_pin_to_irq(unsigned int pin, char *name);

arch/sparc/kernel/setup.c

+0 −10
Original line number Diff line number Diff line
@@ -121,16 +121,6 @@ static struct console prom_debug_console = { 
	.index =	-1,

};



int obp_system_intr(void)

{

	if (boot_flags & BOOTME_DEBUG) {

		printk("OBP: system interrupted\n");

		prom_halt();

		return 1;

	}

	return 0;

}



/* 

 * Process kernel command line switches that are specific to the

 * SPARC or that require special low-level processing.

arch/sparc/kernel/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ SECTIONS 


  . = ALIGN(4096);

  __init_begin = .;

  .init.text : { 

  _sinittext = .;

  .init.text : { 

	*(.init.text)

	_einittext = .;

  }

  _einittext = .;

  __init_text_end = .;

  .init.data : { *(.init.data) }

  . = ALIGN(16);

arch/sparc/mm/srmmu.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ void srmmu_nocache_calcsize(void) 
	srmmu_nocache_end = SRMMU_NOCACHE_VADDR + srmmu_nocache_size;

}



void srmmu_nocache_init(void)

void __init srmmu_nocache_init(void)

{

	unsigned int bitmap_bits;

	pgd_t *pgd;

arch/sparc64/kernel/setup.c

+0 −10
Original line number Diff line number Diff line
@@ -91,16 +91,6 @@ void kernel_enter_debugger(void) 
{

}



int obp_system_intr(void)

{

	if (boot_flags & BOOTME_DEBUG) {

		printk("OBP: system interrupted\n");

		prom_halt();

		return 1;

	}

	return 0;

}



/* 

 * Process kernel command line switches that are specific to the

 * SPARC or that require special low-level processing.