Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2006-10-12 07:37:59 -07:00
commit 83d3d3c524
6 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/sparc/kernel/pcic.c
View file

@ -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);

10
arch/sparc/kernel/setup.c
View file

@ -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.

4
arch/sparc/kernel/vmlinux.lds.S
View file

@ -36,11 +36,11 @@ SECTIONS
. = ALIGN(4096);
__init_begin = .;
_sinittext = .;
.init.text : {
_sinittext = .;
*(.init.text)
_einittext = .;
}
_einittext = .;
__init_text_end = .;
.init.data : { *(.init.data) }
. = ALIGN(16);

2
arch/sparc/mm/srmmu.c
View file

@ -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;

10
arch/sparc64/kernel/setup.c
View file

@ -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.

6
drivers/serial/sunzilog.c
View file

@ -1182,7 +1182,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
return 0;
}
static struct console sunzilog_console = {
static struct console sunzilog_console_ops = {
.name = "ttyS",
.write = sunzilog_console_write,
.device = uart_console_device,
@ -1208,10 +1208,10 @@ static inline struct console *SUNZILOG_CONSOLE(void)
if (i == NUM_CHANNELS)
return NULL;
sunzilog_console.index = i;
sunzilog_console_ops.index = i;
sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS;
return &sunzilog_console;
return &sunzilog_console_ops;
}
#else