diff options
| author | Matthew Wilcox <willy@debian.org> | 2003-12-29 18:24:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-12-29 18:24:24 -0800 |
| commit | 313c01d3e3fdc0c780e0445a6019e44edba5420c (patch) | |
| tree | 5236ec58b7694edb6847b4d87dd120828eef397f /arch/parisc/kernel/processor.c | |
| parent | bfd3fcff8e5dca44ec53075af9d61d308b451a9c (diff) | |
[PATCH] PA-RISC update for 2.6.0
Highlights:
- Switch to generic ioctl32 handling
- Use the new *_defconfig mechanism
- Use drivers/Kconfig
- Big signal cleanups and support for restartable syscalls
Diffstat (limited to 'arch/parisc/kernel/processor.c')
| -rw-r--r-- | arch/parisc/kernel/processor.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index ddccdfe8adbe..5b05759ac9d1 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c @@ -27,14 +27,12 @@ * */ #include <linux/config.h> +#include <linux/delay.h> +#include <linux/init.h> #include <linux/mm.h> -#include <linux/slab.h> +#include <linux/module.h> #include <linux/seq_file.h> -#include <linux/init.h> -#include <linux/delay.h> -#define PCI_DEBUG -#include <linux/pci.h> -#undef PCI_DEBUG +#include <linux/slab.h> #include <asm/cache.h> #include <asm/hardware.h> /* for register_parisc_driver() stuff */ @@ -45,6 +43,8 @@ #include <asm/parisc-device.h> struct system_cpuinfo_parisc boot_cpu_data; +EXPORT_SYMBOL(boot_cpu_data); + struct cpuinfo_parisc cpu_data[NR_CPUS]; /* @@ -105,11 +105,11 @@ static int __init processor_probe(struct parisc_device *dev) status = pdc_pat_cell_module(&bytecnt, dev->pcell_loc, dev->mod_index, PA_VIEW, &pa_pdc_cell); - ASSERT(PDC_OK == status); + BUG_ON(PDC_OK != status); /* verify it's the same as what do_pat_inventory() found */ - ASSERT(dev->mod_info == pa_pdc_cell.mod_info); - ASSERT(dev->pmod_loc == pa_pdc_cell.mod_location); + BUG_ON(dev->mod_info != pa_pdc_cell.mod_info); + BUG_ON(dev->pmod_loc != pa_pdc_cell.mod_location); txn_addr = pa_pdc_cell.mod[0]; /* id_eid for IO sapic */ @@ -122,7 +122,7 @@ static int __init processor_probe(struct parisc_device *dev) /* get the cpu number */ status = pdc_pat_cpu_get_number(&cpu_info, dev->hpa); - ASSERT(PDC_OK == status); + BUG_ON(PDC_OK != status); if (cpu_info.cpu_num >= NR_CPUS) { printk(KERN_WARNING "IGNORING CPU at 0x%x," |