Skip to content

L
linux
"bt5/erp5_web_multiflex5_theme/bt/revision" did not exist on "56173791832c7bce765a83071b9208e5b6b60ad5"
Commit a53a7ba3 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5 

into kernel.bkbits.net:/home/davem/sparc-2.5
parents d62a3dd4 f243b377
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 63 deletions
arch/sparc/kernel/process.c
View file @ a53a7ba3
...@@ -186,18 +186,6 @@ void machine_power_off(void) ...@@ -186,18 +186,6 @@ void machine_power_off(void)
machine_halt(); machine_halt();
} }
void show_regwindow(struct reg_window *rw)
{
printk("l0: %08lx l1: %08lx l2: %08lx l3: %08lx "
"l4: %08lx l5: %08lx l6: %08lx l7: %08lx\n",
rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
rw->locals[4], rw->locals[5], rw->locals[6], rw->locals[7]);
printk("i0: %08lx i1: %08lx i2: %08lx i3: %08lx "
"i4: %08lx i5: %08lx fp: %08lx i7: %08lx\n",
rw->ins[0], rw->ins[1], rw->ins[2], rw->ins[3],
rw->ins[4], rw->ins[5], rw->ins[6], rw->ins[7]);
}
static spinlock_t sparc_backtrace_lock = SPIN_LOCK_UNLOCKED; static spinlock_t sparc_backtrace_lock = SPIN_LOCK_UNLOCKED;
void __show_backtrace(unsigned long fp) void __show_backtrace(unsigned long fp)
...@@ -248,6 +236,7 @@ void smp_show_backtrace_all_cpus(void) ...@@ -248,6 +236,7 @@ void smp_show_backtrace_all_cpus(void)
} }
#endif #endif
#if 0
void show_stackframe(struct sparc_stackf *sf) void show_stackframe(struct sparc_stackf *sf)
{ {
unsigned long size; unsigned long size;
...@@ -275,24 +264,27 @@ void show_stackframe(struct sparc_stackf *sf) ...@@ -275,24 +264,27 @@ void show_stackframe(struct sparc_stackf *sf)
printk("s%d: %08lx\n", i++, *stk++); printk("s%d: %08lx\n", i++, *stk++);
} while ((size -= sizeof(unsigned long))); } while ((size -= sizeof(unsigned long)));
} }
#endif
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *r)
{ {
printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", regs->psr, struct reg_window *rw = (struct reg_window *) r->u_regs[14];
regs->pc, regs->npc, regs->y, print_tainted());
printk("g0: %08lx g1: %08lx g2: %08lx g3: %08lx ", printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
regs->u_regs[0], regs->u_regs[1], regs->u_regs[2], r->psr, r->pc, r->npc, r->y, print_tainted());
regs->u_regs[3]); printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
printk("g4: %08lx g5: %08lx g6: %08lx g7: %08lx\n", r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
regs->u_regs[4], regs->u_regs[5], regs->u_regs[6], r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
regs->u_regs[7]); printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
printk("o0: %08lx o1: %08lx o2: %08lx o3: %08lx ", r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
regs->u_regs[8], regs->u_regs[9], regs->u_regs[10], r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
regs->u_regs[11]);
printk("o4: %08lx o5: %08lx sp: %08lx o7: %08lx\n", printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
regs->u_regs[12], regs->u_regs[13], regs->u_regs[14], rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
regs->u_regs[15]); rw->locals[4], rw->locals[5], rw->locals[6], rw->locals[7]);
show_regwindow((struct reg_window *)regs->u_regs[14]); printk("%%I: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
rw->ins[0], rw->ins[1], rw->ins[2], rw->ins[3],
rw->ins[4], rw->ins[5], rw->ins[6], rw->ins[7]);
} }
void show_trace_task(struct task_struct *tsk) void show_trace_task(struct task_struct *tsk)
......
arch/sparc/mm/init.c
View file @ a53a7ba3
...@@ -107,8 +107,6 @@ void __init sparc_context_init(int numctx) ...@@ -107,8 +107,6 @@ void __init sparc_context_init(int numctx)
add_to_free_ctxlist(ctx_list_pool + ctx); add_to_free_ctxlist(ctx_list_pool + ctx);
} }
#define DEBUG_BOOTMEM
extern unsigned long cmdline_memory_size; extern unsigned long cmdline_memory_size;
unsigned long last_valid_pfn; unsigned long last_valid_pfn;
...@@ -157,14 +155,11 @@ unsigned long calc_max_low_pfn(void) ...@@ -157,14 +155,11 @@ unsigned long calc_max_low_pfn(void)
unsigned long __init bootmem_init(unsigned long *pages_avail) unsigned long __init bootmem_init(unsigned long *pages_avail)
{ {
unsigned long bootmap_size, start_pfn, max_pfn; unsigned long bootmap_size, start_pfn;
unsigned long end_of_phys_memory = 0UL; unsigned long end_of_phys_memory = 0UL;
unsigned long bootmap_pfn, bytes_avail, size; unsigned long bootmap_pfn, bytes_avail, size;
int i; int i;
#ifdef DEBUG_BOOTMEM
prom_printf("bootmem_init: Scan sp_banks, ");
#endif
bytes_avail = 0UL; bytes_avail = 0UL;
for (i = 0; sp_banks[i].num_bytes != 0; i++) { for (i = 0; sp_banks[i].num_bytes != 0; i++) {
end_of_phys_memory = sp_banks[i].base_addr + end_of_phys_memory = sp_banks[i].base_addr +
...@@ -234,10 +229,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) ...@@ -234,10 +229,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
} }
#endif #endif
/* Initialize the boot-time allocator. */ /* Initialize the boot-time allocator. */
#ifdef DEBUG_BOOTMEM
prom_printf("init_bootmem(spfn[%lx],bpfn[%lx],mlpfn[%lx])\n",
start_pfn, bootmap_pfn, max_low_pfn);
#endif
bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, phys_base>>PAGE_SHIFT, max_low_pfn); bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, phys_base>>PAGE_SHIFT, max_low_pfn);
/* Now register the available physical memory with the /* Now register the available physical memory with the
...@@ -264,23 +255,14 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) ...@@ -264,23 +255,14 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
size = (last_pfn - curr_pfn) << PAGE_SHIFT; size = (last_pfn - curr_pfn) << PAGE_SHIFT;
*pages_avail += last_pfn - curr_pfn; *pages_avail += last_pfn - curr_pfn;
#ifdef DEBUG_BOOTMEM
prom_printf("free_bootmem: base[%lx] size[%lx]\n", free_bootmem(sp_banks[i].base_addr, size);
sp_banks[i].base_addr,
size);
#endif
free_bootmem(sp_banks[i].base_addr,
size);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start) { if (initrd_start) {
size = initrd_end - initrd_start;
#ifdef DEBUG_BOOTMEM
prom_printf("reserve_bootmem: base[%lx] size[%lx]\n",
initrd_start, size);
#endif
/* Reserve the initrd image area. */ /* Reserve the initrd image area. */
size = initrd_end - initrd_start;
reserve_bootmem(initrd_start, size); reserve_bootmem(initrd_start, size);
*pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;
...@@ -290,9 +272,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) ...@@ -290,9 +272,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
#endif #endif
/* Reserve the kernel text/data/bss. */ /* Reserve the kernel text/data/bss. */
size = (start_pfn << PAGE_SHIFT) - phys_base; size = (start_pfn << PAGE_SHIFT) - phys_base;
#ifdef DEBUG_BOOTMEM
prom_printf("reserve_bootmem: base[%lx] size[%lx]\n", phys_base, size);
#endif
reserve_bootmem(phys_base, size); reserve_bootmem(phys_base, size);
*pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;
...@@ -301,10 +280,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) ...@@ -301,10 +280,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
* in free_all_bootmem. * in free_all_bootmem.
*/ */
size = bootmap_size; size = bootmap_size;
#ifdef DEBUG_BOOTMEM
prom_printf("reserve_bootmem: base[%lx] size[%lx]\n",
(bootmap_pfn << PAGE_SHIFT), size);
#endif
reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size); reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size);
*pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;
...@@ -448,9 +423,6 @@ void __init mem_init(void) ...@@ -448,9 +423,6 @@ void __init mem_init(void)
max_mapnr = last_valid_pfn - (phys_base >> PAGE_SHIFT); max_mapnr = last_valid_pfn - (phys_base >> PAGE_SHIFT);
high_memory = __va(max_low_pfn << PAGE_SHIFT); high_memory = __va(max_low_pfn << PAGE_SHIFT);
#ifdef DEBUG_BOOTMEM
prom_printf("mem_init: Calling free_all_bootmem().\n");
#endif
num_physpages = totalram_pages = free_all_bootmem(); num_physpages = totalram_pages = free_all_bootmem();
for (i = 0; sp_banks[i].num_bytes != 0; i++) { for (i = 0; sp_banks[i].num_bytes != 0; i++) {
......
drivers/scsi/esp.c
View file @ a53a7ba3
...@@ -4380,10 +4380,7 @@ static Scsi_Host_Template driver_template = { ...@@ -4380,10 +4380,7 @@ static Scsi_Host_Template driver_template = {
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1, .cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
/* Sparc32's iommu code cannot handle highmem pages yet. */
#ifdef CONFIG_SPARC64
.highmem_io = 1, .highmem_io = 1,
#endif
}; };
#include "scsi_module.c" #include "scsi_module.c"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7