diff options
Diffstat (limited to 'include')
37 files changed, 812 insertions, 533 deletions
diff --git a/include/asm-mips64/sn/klconfig.h b/include/asm-mips64/sn/klconfig.h index 493582fc5..1c79d7ee0 100644 --- a/include/asm-mips64/sn/klconfig.h +++ b/include/asm-mips64/sn/klconfig.h @@ -11,8 +11,6 @@ #ifndef _ASM_SN_KLCONFIG_H #define _ASM_SN_KLCONFIG_H -#include <linux/config.h> - /* * The KLCONFIG structures store info about the various BOARDs found * during Hardware Discovery. In addition, it stores info about the @@ -29,6 +27,7 @@ * that offsets of existing fields do not change. */ +#include <linux/config.h> #include <linux/types.h> #include <asm/sn/types.h> #if defined(CONFIG_SGI_IP27) @@ -37,29 +36,25 @@ // XXX Stolen from <sys/SN/router.h>: #define MAX_ROUTER_PORTS (6) /* Max. number of ports on a router */ #include <asm/sn/sn0/sn0_fru.h> -#include <asm/sn/agent.h> //#include <sys/graph.h> -#include <asm/arc/types.h> -#include <asm/arc/hinv.h> //#include <sys/xtalk/xbow.h> -#if defined(CONFIG_SGI_IO) -// The hack file has to be before vector and after sn0_fru.... -#include <asm/hack.h> -#include <asm/sn/vector.h> -#include <asm/xtalk/xtalk.h> -#endif /* CONFIG_SGI_IO */ #elif defined(CONFIG_SGI_IP35) -#include <asm/hack.h> #include <asm/sn/sn1/addrs.h> -#include <asm/sn/vector.h> #include <sys/sn/router.h> -#include <asm/sn/agent.h> #include <sys/graph.h> +#include <asm/xtalk/xbow.h> +#endif /* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */ +#if defined(CONFIG_SGI_IP27) || defined(CONFIG_SGI_IP35) +#include <asm/sn/agent.h> #include <asm/arc/types.h> #include <asm/arc/hinv.h> -#include <asm/xtalk/xbow.h> +#if defined(CONFIG_SGI_IO) || defined(CONFIG_SGI_IP35) +// The hack file has to be before vector and after sn0_fru.... +#include <asm/hack.h> +#include <asm/sn/vector.h> #include <asm/xtalk/xtalk.h> -#endif /* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */ +#endif /* CONFIG_SGI_IO || CONFIG_SGI_IP35 */ +#endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ #define KLCFGINFO_MAGIC 0xbeedbabe diff --git a/include/asm-ppc/backlight.h b/include/asm-ppc/backlight.h new file mode 100644 index 000000000..db315e677 --- /dev/null +++ b/include/asm-ppc/backlight.h @@ -0,0 +1,28 @@ +/* + * Routines for handling backlight control on PowerBooks + * + * For now, implementation resides in arch/ppc/kernel/pmac_support.c + * + */ +#ifndef __ASM_PPC_BACKLIGHT_H +#define __ASM_PPC_BACKLIGHT_H + +/* Abstract values */ +#define BACKLIGHT_OFF 0 +#define BACKLIGHT_MIN 1 +#define BACKLIGHT_MAX 0xf + +struct backlight_controller { + int (*set_enable)(int enable, int level, void *data); + int (*set_level)(int level, void *data); +}; + +extern void register_backlight_controller(struct backlight_controller *ctrler, void *data, char *type); +extern void unregister_backlight_controller(struct backlight_controller *ctrler, void *data); + +extern int set_backlight_enable(int enable); +extern int get_backlight_enable(void); +extern int set_backlight_level(int level); +extern int get_backlight_level(void); + +#endif
\ No newline at end of file diff --git a/include/asm-ppc/feature.h b/include/asm-ppc/feature.h index 78d73b532..c9f2d2eac 100644 --- a/include/asm-ppc/feature.h +++ b/include/asm-ppc/feature.h @@ -45,6 +45,7 @@ enum system_feature { FEATURE_IDE2_reset, FEATURE_Mediabay_IDE_switch, /* MB IDE bus switch */ FEATURE_Mediabay_content, /* MB content indicator enable */ + FEATURE_Airport_reset, /* Is it actually a reset ? */ FEATURE_last, }; @@ -70,4 +71,20 @@ extern int feature_clear(struct device_node* device, enum system_feature f); extern void feature_init(void); +/* + * Additional functions related to Core99 machines + */ +extern void feature_set_gmac_power(struct device_node* device, int power); + +extern void feature_set_usb_power(struct device_node* device, int power); + +extern void feature_set_firewire_power(struct device_node* device, int power); + +/* + * Sleep related functions. At term, they should be high-priority notifiers + */ +extern void feature_prepare_for_sleep(void); + +extern void feature_wake_up(void); + #endif /* __ASM_PPC_FEATURE_H */ diff --git a/include/asm-ppc/hardirq.h b/include/asm-ppc/hardirq.h index 0c5a1090d..239580395 100644 --- a/include/asm-ppc/hardirq.h +++ b/include/asm-ppc/hardirq.h @@ -4,24 +4,38 @@ #include <linux/config.h> #include <asm/smp.h> -extern unsigned int local_irq_count[NR_CPUS]; +typedef struct { + unsigned int __local_irq_count; + unsigned int __local_bh_count; + atomic_t __nmi_counter; + unsigned int __pad[5]; +} ____cacheline_aligned irq_cpustat_t; + +extern irq_cpustat_t irq_stat [NR_CPUS]; + +/* + * Simple wrappers reducing source bloat + */ +#define local_irq_count(cpu) (irq_stat[(cpu)].__local_irq_count) +#define local_bh_count(cpu) (irq_stat[(cpu)].__local_bh_count) +#define nmi_counter(cpu) (irq_stat[(cpu)].__nmi_counter) /* * Are we in an interrupt context? Either doing bottom half * or hardware interrupt processing? */ #define in_interrupt() ({ int __cpu = smp_processor_id(); \ - (local_irq_count[__cpu] + local_bh_count[__cpu] != 0); }) + (local_irq_count(__cpu) + local_bh_count(__cpu) != 0); }) -#define in_irq() (local_irq_count[smp_processor_id()] != 0) +#define in_irq() (local_irq_count(smp_processor_id()) != 0) #ifndef CONFIG_SMP -#define hardirq_trylock(cpu) (local_irq_count[cpu] == 0) +#define hardirq_trylock(cpu) (local_irq_count(cpu) == 0) #define hardirq_endlock(cpu) do { } while (0) -#define hardirq_enter(cpu) (local_irq_count[cpu]++) -#define hardirq_exit(cpu) (local_irq_count[cpu]--) +#define hardirq_enter(cpu) (local_irq_count(cpu)++) +#define hardirq_exit(cpu) (local_irq_count(cpu)--) #define synchronize_irq() do { } while (0) @@ -46,7 +60,7 @@ static inline void hardirq_enter(int cpu) { unsigned int loops = 10000000; - ++local_irq_count[cpu]; + ++local_irq_count(cpu); atomic_inc(&global_irq_count); while (test_bit(0,&global_irq_lock)) { if (smp_processor_id() == global_irq_holder) { @@ -68,7 +82,7 @@ static inline void hardirq_enter(int cpu) static inline void hardirq_exit(int cpu) { atomic_dec(&global_irq_count); - --local_irq_count[cpu]; + --local_irq_count(cpu); } static inline int hardirq_trylock(int cpu) diff --git a/include/asm-ppc/heathrow.h b/include/asm-ppc/heathrow.h index 84a862670..647c63261 100644 --- a/include/asm-ppc/heathrow.h +++ b/include/asm-ppc/heathrow.h @@ -13,36 +13,35 @@ * Bits in feature control register. * Bits postfixed with a _N are in inverse logic */ -#define HRW_MODEM_POWER_N 1 /* turns off modem power */ -#define HRW_BAY_POWER_N 2 -#define HRW_BAY_PCI_ENABLE 4 -#define HRW_BAY_IDE_ENABLE 8 -#define HRW_BAY_FLOPPY_ENABLE 0x10 -#define HRW_IDE0_ENABLE 0x20 -#define HRW_IDE0_RESET_N 0x40 -#define HRW_BAY_RESET_N 0x80 -#define HRW_IOBUS_ENABLE 0x100 /* Internal IDE ? */ -#define HRW_SCC_ENABLE 0x200 -#define HRW_MESH_ENABLE 0x400 -#define HRW_SWIM_ENABLE 0x800 -#define HRW_SOUND_POWER_N 0x1000 -#define HRW_SOUND_CLK_ENABLE 0x2000 -#define HRW_SCCA_IO 0x4000 -#define HRW_SCCB_IO 0x8000 -#define HRW_PORT_OR_DESK_VIA_N 0x10000 /* This one is 0 on PowerBook */ -#define HRW_PWM_MON_ID_N 0x20000 /* ??? (0) */ -#define HRW_HOOK_MB_CNT_N 0x40000 /* ??? (0) */ -#define HRW_SWIM_CLONE_FLOPPY 0x80000 /* ??? (0) */ -#define HRW_AUD_RUN22 0x100000 /* ??? (1) */ -#define HRW_SCSI_LINK_MODE 0x200000 /* Read ??? (1) */ -#define HRW_ARB_BYPASS 0x400000 /* ??? (0 on main, 1 on gatwick) */ -#define HRW_IDE1_RESET_N 0x800000 /* Media bay */ -#define HRW_SLOW_SCC_PCLK 0x1000000 /* ??? (0) */ -#define HRW_RESET_SCC 0x2000000 /* perhaps? */ -#define HRW_MFDC_CELL_ENABLE 0x4000000 /* ??? (0) */ -#define HRW_USE_MFDC 0x8000000 /* ??? (0) */ +#define HRW_RESET_SCC 0x00000001 /* Named in_use_led in OF ??? */ +#define HRW_BAY_POWER_N 0x00000002 +#define HRW_BAY_PCI_ENABLE 0x00000004 +#define HRW_BAY_IDE_ENABLE 0x00000008 +#define HRW_BAY_FLOPPY_ENABLE 0x00000010 +#define HRW_IDE0_ENABLE 0x00000020 +#define HRW_IDE0_RESET_N 0x00000040 +#define HRW_BAY_RESET_N 0x00000080 +#define HRW_IOBUS_ENABLE 0x00000100 /* Internal IDE ? */ +#define HRW_SCC_ENABLE 0x00000200 +#define HRW_MESH_ENABLE 0x00000400 +#define HRW_SWIM_ENABLE 0x00000800 +#define HRW_SOUND_POWER_N 0x00001000 +#define HRW_SOUND_CLK_ENABLE 0x00002000 +#define HRW_SCCA_IO 0x00004000 +#define HRW_SCCB_IO 0x00008000 +#define HRW_PORT_OR_DESK_VIA_N 0x00010000 /* This one is 0 on PowerBook */ +#define HRW_PWM_MON_ID_N 0x00020000 /* ??? (0) */ +#define HRW_HOOK_MB_CNT_N 0x00040000 /* ??? (0) */ +#define HRW_SWIM_CLONE_FLOPPY 0x00080000 /* ??? (0) */ +#define HRW_AUD_RUN22 0x00100000 /* ??? (1) */ +#define HRW_SCSI_LINK_MODE 0x00200000 /* Read ??? (1) */ +#define HRW_ARB_BYPASS 0x00400000 /* ??? (0 on main, 1 on gatwick) */ +#define HRW_IDE1_RESET_N 0x00800000 /* Media bay */ +#define HRW_SLOW_SCC_PCLK 0x01000000 /* ??? (0) */ +#define HRW_MODEM_POWER_N 0x02000000 /* Used by internal modem on wallstreet */ +#define HRW_MFDC_CELL_ENABLE 0x04000000 /* ??? (0) */ +#define HRW_USE_MFDC 0x08000000 /* ??? (0) */ #define HRW_BMAC_IO_ENABLE 0x60000000 /* two bits, not documented in OF */ #define HRW_BMAC_RESET 0x80000000 /* not documented in OF */ - #define PADD_MODEM_POWER_N 0x00000001 /* modem power on paddington */ diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index 5e7b1b578..108004ae2 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -74,6 +74,11 @@ struct machdep_calls { unsigned char dev_fn, unsigned char offset, unsigned int val); void (*pcibios_fixup)(void); void (*pcibios_fixup_bus)(struct pci_bus *); + + void* (*pci_dev_io_base)(unsigned char bus, unsigned char devfn); + void* (*pci_dev_mem_base)(unsigned char bus, unsigned char devfn); + int (*pci_dev_root_bridge)(unsigned char bus, unsigned char devfn); + /* this is for modules, since _machine can be a define -- Cort */ int ppc_machine; }; diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index 2befa81ba..db327b76a 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h @@ -32,6 +32,14 @@ #include <asm/rpxclassic.h> #endif +#if (defined(CONFIG_TQM860) || defined(CONFIG_TQM860L)) +#include <asm/tqm860.h> +#endif + +#ifdef CONFIG_TQM8xxL +#include <asm/tqm8xxL.h> +#endif + /* I need this to get pt_regs....... */ #include <asm/ptrace.h> diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h index 47a2cc87d..ca893118a 100644 --- a/include/asm-ppc/pci-bridge.h +++ b/include/asm-ppc/pci-bridge.h @@ -6,9 +6,22 @@ void pmac_find_bridges(void); /* * pci_io_base returns the memory address at which you can access * the I/O space for PCI bus number `bus' (or NULL on error). + * + * NOTE: This doesn't handle the new Uni-N chip which requires + * per-device io_base. */ void *pci_io_base(unsigned int bus); +/* This version handles the new Uni-N host bridge, the iobase is now + * a per-device thing. I also added the memory base so PReP can + * be fixed to return 0xc0000000 (I didn't actually implement it) + */ +void *pci_dev_io_base(unsigned char bus, unsigned char devfn); +void *pci_dev_mem_base(unsigned char bus, unsigned char devfn); + +/* Returns the root-bridge number (Uni-N number) of a device */ +int pci_dev_root_bridge(unsigned char bus, unsigned char devfn); + /* * pci_device_loc returns the bus number and device/function number * for a device on a PCI bus, given its device_node struct. diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h index 26fe498dc..a9da1b195 100644 --- a/include/asm-ppc/pci.h +++ b/include/asm-ppc/pci.h @@ -1,6 +1,13 @@ #ifndef __PPC_PCI_H #define __PPC_PCI_H +/* Values for the `which' argument to sys_pciconfig_iobase syscall. */ +#define IOBASE_BRIDGE_NUMBER 0 +#define IOBASE_MEMORY 1 +#define IOBASE_IO 2 + +#ifdef __KERNEL__ + /* Can be used to override the logic in pci_scan_bus for skipping * already-configured bus numbers - to be used for buggy BIOSes * or architectures with incomplete PCI setup by the loader. @@ -95,4 +102,6 @@ extern inline int pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask) #define sg_dma_address(sg) (virt_to_bus((sg)->address)) #define sg_dma_len(sg) ((sg)->length) +#endif /* __KERNEL__ */ + #endif /* __PPC_PCI_H */ diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 86a086e79..a0a96d937 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -10,7 +10,6 @@ #include <linux/config.h> #include <asm/ptrace.h> -#include <asm/residual.h> #include <asm/types.h> /* Machine State Register (MSR) Fields */ @@ -505,6 +504,8 @@ #define _MACH_oak 0x00000800 /* IBM "Oak" 403 eval. board */ #define _MACH_walnut 0x00001000 /* IBM "Walnut" 405GP eval. board */ #define _MACH_8260 0x00002000 /* Generic 8260 */ +#define _MACH_tqm860 0x00004000 /* TQM860/L */ +#define _MACH_tqm8xxL 0x00008000 /* TQM8xxL */ /* see residual.h for these */ diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h index 70ff81302..a3d6e5d22 100644 --- a/include/asm-ppc/prom.h +++ b/include/asm-ppc/prom.h @@ -89,4 +89,7 @@ extern void prom_drawstring(const char *c); extern void prom_drawhex(unsigned long v); extern void prom_drawchar(char c); +extern void map_bootx_text(void); + + #endif /* _PPC_PROM_H */ diff --git a/include/asm-ppc/softirq.h b/include/asm-ppc/softirq.h index 550b46192..f23ed416b 100644 --- a/include/asm-ppc/softirq.h +++ b/include/asm-ppc/softirq.h @@ -6,9 +6,9 @@ extern unsigned int local_bh_count[NR_CPUS]; -#define local_bh_disable() do { local_bh_count[smp_processor_id()]++; barrier(); } while (0) -#define local_bh_enable() do { barrier(); local_bh_count[smp_processor_id()]--; } while (0) +#define local_bh_disable() do { local_bh_count(smp_processor_id())++; barrier(); } while (0) +#define local_bh_enable() do { barrier(); local_bh_count(smp_processor_id())--; } while (0) -#define in_softirq() (local_bh_count[smp_processor_id()] != 0) +#define in_softirq() (local_bh_count(smp_processor_id()) != 0) #endif /* __ASM_SOFTIRQ_H */ diff --git a/include/asm-ppc/time.h b/include/asm-ppc/time.h new file mode 100644 index 000000000..05d791546 --- /dev/null +++ b/include/asm-ppc/time.h @@ -0,0 +1,42 @@ +/* + * $Id: time.h,v 1.12 1999/08/27 04:21:23 cort Exp $ + * Common time prototypes and such for all ppc machines. + * + * Written by Cort Dougan (cort@cs.nmt.edu) to merge + * Paul Mackerras' version and mine for PReP and Pmac. + */ + +#include <linux/config.h> +#include <linux/mc146818rtc.h> + +#include <asm/processor.h> + +/* time.c */ +extern unsigned decrementer_count; +extern unsigned count_period_num; +extern unsigned count_period_den; +extern unsigned long mktime(unsigned int, unsigned int, unsigned int, + unsigned int, unsigned int, unsigned int); +extern void to_tm(int tim, struct rtc_time * tm); +extern time_t last_rtc_update; + +int via_calibrate_decr(void); + +/* Accessor functions for the decrementer register. */ +static __inline__ unsigned int get_dec(void) +{ +#if defined(CONFIG_4xx) + return (mfspr(SPRN_PIT)); +#else + return (mfspr(SPRN_DEC)); +#endif +} + +static __inline__ void set_dec(unsigned int val) +{ +#if defined(CONFIG_4xx) + mtspr(SPRN_PIT, val); +#else + mtspr(SPRN_DEC, val); +#endif +} diff --git a/include/asm-ppc/tqm860.h b/include/asm-ppc/tqm860.h new file mode 100644 index 000000000..a42b7b277 --- /dev/null +++ b/include/asm-ppc/tqm860.h @@ -0,0 +1,65 @@ + +/* + * A collection of structures, addresses, and values associated with + * the TQ Systems TQM860 modules. This was originally created for the + * MBX860, and probably needs revisions for other boards (like the 821). + * When this file gets out of control, we can split it up into more + * meaningful pieces. + * + * Based on mbx.h, Copyright (c) 1997 Dan Malek (dmalek@jlc.net) + * + * Copyright (c) 1999 Wolfgang Denk (wd@denx.de) + */ +#ifndef __MACH_TQM860_DEFS +#define __MACH_TQM860_DEFS + +/* A Board Information structure that is given to a program when + * EPPC-Bug starts it up. + */ +typedef struct bd_info { + unsigned long bi_memstart; /* start of DRAM memory */ + unsigned long bi_memsize; /* size of DRAM memory in bytes */ + unsigned long bi_flashstart; /* start of FLASH memory */ + unsigned long bi_flashsize; /* size of FLASH memory */ + unsigned long bi_flashoffset; /* reserved area for startup monitor */ + unsigned long bi_sramstart; /* start of SRAM memory */ + unsigned long bi_sramsize; /* size of SRAM memory */ + unsigned long bi_immr_base; /* base of IMMR register */ + unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ + unsigned long bi_ip_addr; /* IP Address */ + unsigned char bi_enetaddr[6]; /* Ethernet adress */ + unsigned char bi_reserved[2]; /* -- just for alignment -- */ + unsigned long bi_putchar; /* Addr of monitor putchar() to Console */ + unsigned long bi_intfreq; /* Internal Freq, in MHz */ + unsigned long bi_busfreq; /* Bus Freq, in MHz */ + unsigned long bi_baudrate; /* Console Baudrate */ +} bd_t; + +/* Configuration options for TQ Systems TQM860 mini module + */ + +#define TQM_RESET_ADDR 0x40000100 /* Monitor Reset Entry */ + +#define TQM_IMMR_BASE 0xFFF00000 /* phys. addr of IMMR */ +#define TQM_IMAP_SIZE (64 * 1024) /* size of mapped area */ + +#define TQM_CLOCKRATE 50 /* 50 MHz Clock */ +#define TQM_BAUDRATE 115200 /* Console baud rate */ +#define TQM_IP_ADDR 0x0A000063 /* IP addr: 10.0.0.99 */ + +#define TQM_SERVER_IP "10.0.0.3" /* NFS server IP addr */ +#define TQM_SERVER_DIR "/LinuxPPC" /* NFS exported root */ + +#define IMAP_ADDR TQM_IMMR_BASE /* physical base address of IMMR area */ +#define IMAP_SIZE TQM_IMAP_SIZE /* mapped size of IMMR area */ + +/* We don't use the 8259. +*/ +#define NR_8259_INTS 0 + +/* Generic 8xx type +*/ +#define _MACH_8xx (_MACH_tqm860) + +#endif /* __MACH_TQM860_DEFS */ + diff --git a/include/asm-ppc/tqm8xxL.h b/include/asm-ppc/tqm8xxL.h new file mode 100644 index 000000000..e51e98080 --- /dev/null +++ b/include/asm-ppc/tqm8xxL.h @@ -0,0 +1,66 @@ + +/* + * A collection of structures, addresses, and values associated with + * the TQ Systems TQM850L modules. This was originally created for the + * MBX860, and probably needs revisions for other boards (like the 821). + * When this file gets out of control, we can split it up into more + * meaningful pieces. + * + * Based on mbx.h, Copyright (c) 1997 Dan Malek (dmalek@jlc.net) + * + * Copyright (c) 1999 Wolfgang Denk (wd@denx.de) + */ +#ifndef __MACH_TQM8xxL_DEFS +#define __MACH_TQM8xxL_DEFS + +/* A Board Information structure that is given to a program when + * EPPC-Bug starts it up. + */ +typedef struct bd_info { + unsigned long bi_memstart; /* start of DRAM memory */ + unsigned long bi_memsize; /* size of DRAM memory in bytes */ + unsigned long bi_flashstart; /* start of FLASH memory */ + unsigned long bi_flashsize; /* size of FLASH memory */ + unsigned long bi_flashoffset; /* reserved area for startup monitor */ + unsigned long bi_sramstart; /* start of SRAM memory */ + unsigned long bi_sramsize; /* size of SRAM memory */ + unsigned long bi_immr_base; /* base of IMMR register */ + unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ + unsigned long bi_ip_addr; /* IP Address */ + unsigned char bi_enetaddr[6]; /* Ethernet adress */ + unsigned char bi_reserved[2]; /* -- just for alignment -- */ + unsigned long bi_putchar; /* Addr of monitor putchar() to Console */ + unsigned long bi_intfreq; /* Internal Freq, in MHz */ + unsigned long bi_busfreq; /* Bus Freq, in MHz */ + unsigned long bi_baudrate; /* Console Baudrate */ +} bd_t; + +/* Configuration options for TQ Systems TQM850L mini module + */ + +#define TQM_RESET_ADDR 0x40000100 /* Monitor Reset Entry */ + +#define TQM_IMMR_BASE 0xFFF00000 /* phys. addr of IMMR */ +#define TQM_IMAP_SIZE (64 * 1024) /* size of mapped area */ + +#define TQM_CLOCKRATE 50 /* 50 MHz Clock */ +/*#define TQM_BAUDRATE 115200 */ /* Console baud rate */ +#define TQM_BAUDRATE 38400 /* Console baud rate */ +#define TQM_IP_ADDR 0x0A000063 /* IP addr: 10.0.0.99 */ + +#define TQM_SERVER_IP "10.0.0.2" /* NFS server IP addr */ +#define TQM_SERVER_DIR "/LinuxPPC" /* NFS exported root */ + +#define IMAP_ADDR TQM_IMMR_BASE /* physical base address of IMMR area */ +#define IMAP_SIZE TQM_IMAP_SIZE /* mapped size of IMMR area */ + +/* We don't use the 8259. +*/ +#define NR_8259_INTS 0 + +/* Generic 8xx type +*/ +#define _MACH_8xx (_MACH_tqm8xxL) + +#endif /* __MACH_TQM8xxL_DEFS */ + diff --git a/include/asm-ppc/ucontext.h b/include/asm-ppc/ucontext.h index 12d444cb1..3d60332a3 100644 --- a/include/asm-ppc/ucontext.h +++ b/include/asm-ppc/ucontext.h @@ -7,6 +7,7 @@ struct ucontext { unsigned long uc_flags; struct ucontext *uc_link; stack_t uc_stack; + struct sigcontext_struct uc_mcontext; sigset_t uc_sigmask; /* mask last for extensibility */ }; diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h index 4c64c151a..db4e6499b 100644 --- a/include/asm-ppc/unistd.h +++ b/include/asm-ppc/unistd.h @@ -201,6 +201,10 @@ #define __NR_stat64 195 #define __NR_lstat64 196 #define __NR_fstat64 197 +#define __NR_sys_pciconfig_read 198 +#define __NR_sys_pciconfig_write 199 +#define __NR_sys_pciconfig_iobase 200 +#define __NR_multiplexer 201 #define __NR(n) #n diff --git a/include/asm-ppc/vga.h b/include/asm-ppc/vga.h index d7ead205f..69e3d7f9a 100644 --- a/include/asm-ppc/vga.h +++ b/include/asm-ppc/vga.h @@ -21,12 +21,12 @@ * <linux/vt_buffer.h> has already done the right job for us. */ -extern inline void scr_writew(u16 val, u16 *addr) +extern inline void scr_writew(u16 val, volatile u16 *addr) { st_le16(addr, val); } -extern inline u16 scr_readw(const u16 *addr) +extern inline u16 scr_readw(volatile const u16 *addr) { return ld_le16(addr); } diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h index eea4560fc..28c5e47db 100644 --- a/include/asm-s390/elf.h +++ b/include/asm-s390/elf.h @@ -22,7 +22,7 @@ typedef s390_regs elf_gregset_t; /* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch(x) ((x)->elf_machine == EM_S390) +#define elf_check_arch(x) ((x)->e_machine == EM_S390) /* * These are used to set parameters in the core dumps. diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h index d6c868ff0..3c2d94ff6 100644 --- a/include/asm-sparc/asm_offsets.h +++ b/include/asm-sparc/asm_offsets.h @@ -79,112 +79,112 @@ #define AOFF_task_pidhash_pprev 0x00000094 #define ASIZ_task_pidhash_pprev 0x00000004 #define AOFF_task_wait_chldexit 0x00000098 -#define ASIZ_task_wait_chldexit 0x00000014 -#define AOFF_task_vfork_sem 0x000000ac +#define ASIZ_task_wait_chldexit 0x0000000c +#define AOFF_task_vfork_sem 0x000000a4 #define ASIZ_task_vfork_sem 0x00000004 -#define AOFF_task_rt_priority 0x000000b0 +#define AOFF_task_rt_priority 0x000000a8 #define ASIZ_task_rt_priority 0x00000004 -#define AOFF_task_it_real_value 0x000000b4 +#define AOFF_task_it_real_value 0x000000ac #define ASIZ_task_it_real_value 0x00000004 -#define AOFF_task_it_prof_value 0x000000b8 +#define AOFF_task_it_prof_value 0x000000b0 #define ASIZ_task_it_prof_value 0x00000004 -#define AOFF_task_it_virt_value 0x000000bc +#define AOFF_task_it_virt_value 0x000000b4 #define ASIZ_task_it_virt_value 0x00000004 -#define AOFF_task_it_real_incr 0x000000c0 +#define AOFF_task_it_real_incr 0x000000b8 #define ASIZ_task_it_real_incr 0x00000004 -#define AOFF_task_it_prof_incr 0x000000c4 +#define AOFF_task_it_prof_incr 0x000000bc #define ASIZ_task_it_prof_incr 0x00000004 -#define AOFF_task_it_virt_incr 0x000000c8 +#define AOFF_task_it_virt_incr 0x000000c0 #define ASIZ_task_it_virt_incr 0x00000004 -#define AOFF_task_real_timer 0x000000cc +#define AOFF_task_real_timer 0x000000c4 #define ASIZ_task_real_timer 0x00000014 -#define AOFF_task_times 0x000000e0 +#define AOFF_task_times 0x000000d8 #define ASIZ_task_times 0x00000010 -#define AOFF_task_start_time 0x000000f0 +#define AOFF_task_start_time 0x000000e8 #define ASIZ_task_start_time 0x00000004 -#define AOFF_task_per_cpu_utime 0x000000f4 +#define AOFF_task_per_cpu_utime 0x000000ec #define ASIZ_task_per_cpu_utime 0x00000004 -#define AOFF_task_min_flt 0x000000fc +#define AOFF_task_min_flt 0x000000f4 #define ASIZ_task_min_flt 0x00000004 -#define AOFF_task_maj_flt 0x00000100 +#define AOFF_task_maj_flt 0x000000f8 #define ASIZ_task_maj_flt 0x00000004 -#define AOFF_task_nswap 0x00000104 +#define AOFF_task_nswap 0x000000fc #define ASIZ_task_nswap 0x00000004 -#define AOFF_task_cmin_flt 0x00000108 +#define AOFF_task_cmin_flt 0x00000100 #define ASIZ_task_cmin_flt 0x00000004 -#define AOFF_task_cmaj_flt 0x0000010c +#define AOFF_task_cmaj_flt 0x00000104 #define ASIZ_task_cmaj_flt 0x00000004 -#define AOFF_task_cnswap 0x00000110 +#define AOFF_task_cnswap 0x00000108 #define ASIZ_task_cnswap 0x00000004 -#define AOFF_task_uid 0x00000118 +#define AOFF_task_uid 0x00000110 #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x0000011c +#define AOFF_task_euid 0x00000114 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x00000120 +#define AOFF_task_suid 0x00000118 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000124 +#define AOFF_task_fsuid 0x0000011c #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x00000128 +#define AOFF_task_gid 0x00000120 #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x0000012c +#define AOFF_task_egid 0x00000124 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x00000130 +#define AOFF_task_sgid 0x00000128 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000134 +#define AOFF_task_fsgid 0x0000012c #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x00000138 +#define AOFF_task_ngroups 0x00000130 #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x0000013c +#define AOFF_task_groups 0x00000134 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x000001bc +#define AOFF_task_cap_effective 0x000001b4 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x000001c0 +#define AOFF_task_cap_inheritable 0x000001b8 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000001c4 +#define AOFF_task_cap_permitted 0x000001bc #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000001cc +#define AOFF_task_user 0x000001c4 #define ASIZ_task_user 0x00000004 -#define AOFF_task_rlim 0x000001d0 +#define AOFF_task_rlim 0x000001c8 #define ASIZ_task_rlim 0x00000050 -#define AOFF_task_used_math 0x00000220 +#define AOFF_task_used_math 0x00000218 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x00000222 +#define AOFF_task_comm 0x0000021a #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x00000234 +#define AOFF_task_link_count 0x0000022c #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000238 +#define AOFF_task_tty 0x00000230 #define ASIZ_task_tty 0x00000004 -#define AOFF_task_semundo 0x0000023c +#define AOFF_task_semundo 0x00000234 #define ASIZ_task_semundo 0x00000004 -#define AOFF_task_semsleeping 0x00000240 +#define AOFF_task_semsleeping 0x00000238 #define ASIZ_task_semsleeping 0x00000004 -#define AOFF_task_thread 0x00000248 +#define AOFF_task_thread 0x00000240 #define ASIZ_task_thread 0x00000380 -#define AOFF_task_fs 0x000005c8 +#define AOFF_task_fs 0x000005c0 #define ASIZ_task_fs 0x00000004 -#define AOFF_task_files 0x000005cc +#define AOFF_task_files 0x000005c4 #define ASIZ_task_files 0x00000004 -#define AOFF_task_sigmask_lock 0x000005d0 +#define AOFF_task_sigmask_lock 0x000005c8 #define ASIZ_task_sigmask_lock 0x00000004 -#define AOFF_task_sig 0x000005d4 +#define AOFF_task_sig 0x000005cc #define ASIZ_task_sig 0x00000004 -#define AOFF_task_signal 0x000005d8 +#define AOFF_task_signal 0x000005d0 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x000005e0 +#define AOFF_task_blocked 0x000005d8 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x000005e8 +#define AOFF_task_sigqueue 0x000005e0 #define ASIZ_task_sigqueue 0x00000004 -#define AOFF_task_sigqueue_tail 0x000005ec +#define AOFF_task_sigqueue_tail 0x000005e4 #define ASIZ_task_sigqueue_tail 0x00000004 -#define AOFF_task_sas_ss_sp 0x000005f0 +#define AOFF_task_sas_ss_sp 0x000005e8 #define ASIZ_task_sas_ss_sp 0x00000004 -#define AOFF_task_sas_ss_size 0x000005f4 +#define AOFF_task_sas_ss_size 0x000005ec #define ASIZ_task_sas_ss_size 0x00000004 -#define AOFF_task_parent_exec_id 0x000005f8 +#define AOFF_task_parent_exec_id 0x000005f0 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x000005fc +#define AOFF_task_self_exec_id 0x000005f4 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000600 +#define AOFF_task_alloc_lock 0x000005f8 #define ASIZ_task_alloc_lock 0x00000004 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000004 @@ -201,48 +201,48 @@ #define AOFF_mm_map_count 0x00000018 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x0000001c -#define ASIZ_mm_mmap_sem 0x00000020 -#define AOFF_mm_page_table_lock 0x0000003c +#define ASIZ_mm_mmap_sem 0x00000014 +#define AOFF_mm_page_table_lock 0x00000030 #define ASIZ_mm_page_table_lock 0x00000004 -#define AOFF_mm_context 0x00000040 +#define AOFF_mm_context 0x00000034 #define ASIZ_mm_context 0x00000004 -#define AOFF_mm_start_code 0x00000044 +#define AOFF_mm_start_code 0x00000038 #define ASIZ_mm_start_code 0x00000004 -#define AOFF_mm_end_code 0x00000048 +#define AOFF_mm_end_code 0x0000003c #define ASIZ_mm_end_code 0x00000004 -#define AOFF_mm_start_data 0x0000004c +#define AOFF_mm_start_data 0x00000040 #define ASIZ_mm_start_data 0x00000004 -#define AOFF_mm_end_data 0x00000050 +#define AOFF_mm_end_data 0x00000044 #define ASIZ_mm_end_data 0x00000004 -#define AOFF_mm_start_brk 0x00000054 +#define AOFF_mm_start_brk 0x00000048 #define ASIZ_mm_start_brk 0x00000004 -#define AOFF_mm_brk 0x00000058 +#define AOFF_mm_brk 0x0000004c #define ASIZ_mm_brk 0x00000004 -#define AOFF_mm_start_stack 0x0000005c +#define AOFF_mm_start_stack 0x00000050 #define ASIZ_mm_start_stack 0x00000004 -#define AOFF_mm_arg_start 0x00000060 +#define AOFF_mm_arg_start 0x00000054 #define ASIZ_mm_arg_start 0x00000004 -#define AOFF_mm_arg_end 0x00000064 +#define AOFF_mm_arg_end 0x00000058 #define ASIZ_mm_arg_end 0x00000004 -#define AOFF_mm_env_start 0x00000068 +#define AOFF_mm_env_start 0x0000005c #define ASIZ_mm_env_start 0x00000004 -#define AOFF_mm_env_end 0x0000006c +#define AOFF_mm_env_end 0x00000060 #define ASIZ_mm_env_end 0x00000004 -#define AOFF_mm_rss 0x00000070 +#define AOFF_mm_rss 0x00000064 #define ASIZ_mm_rss 0x00000004 -#define AOFF_mm_total_vm 0x00000074 +#define AOFF_mm_total_vm 0x00000068 #define ASIZ_mm_total_vm 0x00000004 -#define AOFF_mm_locked_vm 0x00000078 +#define AOFF_mm_locked_vm 0x0000006c #define ASIZ_mm_locked_vm 0x00000004 -#define AOFF_mm_def_flags 0x0000007c +#define AOFF_mm_def_flags 0x00000070 #define ASIZ_mm_def_flags 0x00000004 -#define AOFF_mm_cpu_vm_mask 0x00000080 +#define AOFF_mm_cpu_vm_mask 0x00000074 #define ASIZ_mm_cpu_vm_mask 0x00000004 -#define AOFF_mm_swap_cnt 0x00000084 +#define AOFF_mm_swap_cnt 0x00000078 #define ASIZ_mm_swap_cnt 0x00000004 -#define AOFF_mm_swap_address 0x00000088 +#define AOFF_mm_swap_address 0x0000007c #define ASIZ_mm_swap_address 0x00000004 -#define AOFF_mm_segments 0x0000008c +#define AOFF_mm_segments 0x00000080 #define ASIZ_mm_segments 0x00000004 #define AOFF_thread_uwinmask 0x00000000 #define ASIZ_thread_uwinmask 0x00000004 @@ -360,112 +360,112 @@ #define AOFF_task_pidhash_pprev 0x00000094 #define ASIZ_task_pidhash_pprev 0x00000004 #define AOFF_task_wait_chldexit 0x00000098 -#define ASIZ_task_wait_chldexit 0x00000018 -#define AOFF_task_vfork_sem 0x000000b0 +#define ASIZ_task_wait_chldexit 0x00000010 +#define AOFF_task_vfork_sem 0x000000a8 #define ASIZ_task_vfork_sem 0x00000004 -#define AOFF_task_rt_priority 0x000000b4 +#define AOFF_task_rt_priority 0x000000ac #define ASIZ_task_rt_priority 0x00000004 -#define AOFF_task_it_real_value 0x000000b8 +#define AOFF_task_it_real_value 0x000000b0 #define ASIZ_task_it_real_value 0x00000004 -#define AOFF_task_it_prof_value 0x000000bc +#define AOFF_task_it_prof_value 0x000000b4 #define ASIZ_task_it_prof_value 0x00000004 -#define AOFF_task_it_virt_value 0x000000c0 +#define AOFF_task_it_virt_value 0x000000b8 #define ASIZ_task_it_virt_value 0x00000004 -#define AOFF_task_it_real_incr 0x000000c4 +#define AOFF_task_it_real_incr 0x000000bc #define ASIZ_task_it_real_incr 0x00000004 -#define AOFF_task_it_prof_incr 0x000000c8 +#define AOFF_task_it_prof_incr 0x000000c0 #define ASIZ_task_it_prof_incr 0x00000004 -#define AOFF_task_it_virt_incr 0x000000cc +#define AOFF_task_it_virt_incr 0x000000c4 #define ASIZ_task_it_virt_incr 0x00000004 -#define AOFF_task_real_timer 0x000000d0 +#define AOFF_task_real_timer 0x000000c8 #define ASIZ_task_real_timer 0x00000014 -#define AOFF_task_times 0x000000e4 +#define AOFF_task_times 0x000000dc #define ASIZ_task_times 0x00000010 -#define AOFF_task_start_time 0x000000f4 +#define AOFF_task_start_time 0x000000ec #define ASIZ_task_start_time 0x00000004 -#define AOFF_task_per_cpu_utime 0x000000f8 +#define AOFF_task_per_cpu_utime 0x000000f0 #define ASIZ_task_per_cpu_utime 0x00000080 -#define AOFF_task_min_flt 0x000001f8 +#define AOFF_task_min_flt 0x000001f0 #define ASIZ_task_min_flt 0x00000004 -#define AOFF_task_maj_flt 0x000001fc +#define AOFF_task_maj_flt 0x000001f4 #define ASIZ_task_maj_flt 0x00000004 -#define AOFF_task_nswap 0x00000200 +#define AOFF_task_nswap 0x000001f8 #define ASIZ_task_nswap 0x00000004 -#define AOFF_task_cmin_flt 0x00000204 +#define AOFF_task_cmin_flt 0x000001fc #define ASIZ_task_cmin_flt 0x00000004 -#define AOFF_task_cmaj_flt 0x00000208 +#define AOFF_task_cmaj_flt 0x00000200 #define ASIZ_task_cmaj_flt 0x00000004 -#define AOFF_task_cnswap 0x0000020c +#define AOFF_task_cnswap 0x00000204 #define ASIZ_task_cnswap 0x00000004 -#define AOFF_task_uid 0x00000214 +#define AOFF_task_uid 0x0000020c #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x00000218 +#define AOFF_task_euid 0x00000210 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x0000021c +#define AOFF_task_suid 0x00000214 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000220 +#define AOFF_task_fsuid 0x00000218 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x00000224 +#define AOFF_task_gid 0x0000021c #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000228 +#define AOFF_task_egid 0x00000220 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x0000022c +#define AOFF_task_sgid 0x00000224 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000230 +#define AOFF_task_fsgid 0x00000228 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x00000234 +#define AOFF_task_ngroups 0x0000022c #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000238 +#define AOFF_task_groups 0x00000230 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x000002b8 +#define AOFF_task_cap_effective 0x000002b0 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x000002bc +#define AOFF_task_cap_inheritable 0x000002b4 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000002c0 +#define AOFF_task_cap_permitted 0x000002b8 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000002c8 +#define AOFF_task_user 0x000002c0 #define ASIZ_task_user 0x00000004 -#define AOFF_task_rlim 0x000002cc +#define AOFF_task_rlim 0x000002c4 #define ASIZ_task_rlim 0x00000050 -#define AOFF_task_used_math 0x0000031c +#define AOFF_task_used_math 0x00000314 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x0000031e +#define AOFF_task_comm 0x00000316 #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x00000330 +#define AOFF_task_link_count 0x00000328 #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000334 +#define AOFF_task_tty 0x0000032c #define ASIZ_task_tty 0x00000004 -#define AOFF_task_semundo 0x00000338 +#define AOFF_task_semundo 0x00000330 #define ASIZ_task_semundo 0x00000004 -#define AOFF_task_semsleeping 0x0000033c +#define AOFF_task_semsleeping 0x00000334 #define ASIZ_task_semsleeping 0x00000004 -#define AOFF_task_thread 0x00000340 +#define AOFF_task_thread 0x00000338 #define ASIZ_task_thread 0x00000380 -#define AOFF_task_fs 0x000006c0 +#define AOFF_task_fs 0x000006b8 #define ASIZ_task_fs 0x00000004 -#define AOFF_task_files 0x000006c4 +#define AOFF_task_files 0x000006bc #define ASIZ_task_files 0x00000004 -#define AOFF_task_sigmask_lock 0x000006c8 +#define AOFF_task_sigmask_lock 0x000006c0 #define ASIZ_task_sigmask_lock 0x00000008 -#define AOFF_task_sig 0x000006d0 +#define AOFF_task_sig 0x000006c8 #define ASIZ_task_sig 0x00000004 -#define AOFF_task_signal 0x000006d4 +#define AOFF_task_signal 0x000006cc #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x000006dc +#define AOFF_task_blocked 0x000006d4 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x000006e4 +#define AOFF_task_sigqueue 0x000006dc #define ASIZ_task_sigqueue 0x00000004 -#define AOFF_task_sigqueue_tail 0x000006e8 +#define AOFF_task_sigqueue_tail 0x000006e0 #define ASIZ_task_sigqueue_tail 0x00000004 -#define AOFF_task_sas_ss_sp 0x000006ec +#define AOFF_task_sas_ss_sp 0x000006e4 #define ASIZ_task_sas_ss_sp 0x00000004 -#define AOFF_task_sas_ss_size 0x000006f0 +#define AOFF_task_sas_ss_size 0x000006e8 #define ASIZ_task_sas_ss_size 0x00000004 -#define AOFF_task_parent_exec_id 0x000006f4 +#define AOFF_task_parent_exec_id 0x000006ec #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x000006f8 +#define AOFF_task_self_exec_id 0x000006f0 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x000006fc +#define AOFF_task_alloc_lock 0x000006f4 #define ASIZ_task_alloc_lock 0x00000008 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000004 @@ -482,48 +482,48 @@ #define AOFF_mm_map_count 0x00000018 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x0000001c -#define ASIZ_mm_mmap_sem 0x00000024 -#define AOFF_mm_page_table_lock 0x00000040 +#define ASIZ_mm_mmap_sem 0x00000018 +#define AOFF_mm_page_table_lock 0x00000034 #define ASIZ_mm_page_table_lock 0x00000008 -#define AOFF_mm_context 0x00000048 +#define AOFF_mm_context 0x0000003c #define ASIZ_mm_context 0x00000004 -#define AOFF_mm_start_code 0x0000004c +#define AOFF_mm_start_code 0x00000040 #define ASIZ_mm_start_code 0x00000004 -#define AOFF_mm_end_code 0x00000050 +#define AOFF_mm_end_code 0x00000044 #define ASIZ_mm_end_code 0x00000004 -#define AOFF_mm_start_data 0x00000054 +#define AOFF_mm_start_data 0x00000048 #define ASIZ_mm_start_data 0x00000004 -#define AOFF_mm_end_data 0x00000058 +#define AOFF_mm_end_data 0x0000004c #define ASIZ_mm_end_data 0x00000004 -#define AOFF_mm_start_brk 0x0000005c +#define AOFF_mm_start_brk 0x00000050 #define ASIZ_mm_start_brk 0x00000004 -#define AOFF_mm_brk 0x00000060 +#define AOFF_mm_brk 0x00000054 #define ASIZ_mm_brk 0x00000004 -#define AOFF_mm_start_stack 0x00000064 +#define AOFF_mm_start_stack 0x00000058 #define ASIZ_mm_start_stack 0x00000004 -#define AOFF_mm_arg_start 0x00000068 +#define AOFF_mm_arg_start 0x0000005c #define ASIZ_mm_arg_start 0x00000004 -#define AOFF_mm_arg_end 0x0000006c +#define AOFF_mm_arg_end 0x00000060 #define ASIZ_mm_arg_end 0x00000004 -#define AOFF_mm_env_start 0x00000070 +#define AOFF_mm_env_start 0x00000064 #define ASIZ_mm_env_start 0x00000004 -#define AOFF_mm_env_end 0x00000074 +#define AOFF_mm_env_end 0x00000068 #define ASIZ_mm_env_end 0x00000004 -#define AOFF_mm_rss 0x00000078 +#define AOFF_mm_rss 0x0000006c #define ASIZ_mm_rss 0x00000004 -#define AOFF_mm_total_vm 0x0000007c +#define AOFF_mm_total_vm 0x00000070 #define ASIZ_mm_total_vm 0x00000004 -#define AOFF_mm_locked_vm 0x00000080 +#define AOFF_mm_locked_vm 0x00000074 #define ASIZ_mm_locked_vm 0x00000004 -#define AOFF_mm_def_flags 0x00000084 +#define AOFF_mm_def_flags 0x00000078 #define ASIZ_mm_def_flags 0x00000004 -#define AOFF_mm_cpu_vm_mask 0x00000088 +#define AOFF_mm_cpu_vm_mask 0x0000007c #define ASIZ_mm_cpu_vm_mask 0x00000004 -#define AOFF_mm_swap_cnt 0x0000008c +#define AOFF_mm_swap_cnt 0x00000080 #define ASIZ_mm_swap_cnt 0x00000004 -#define AOFF_mm_swap_address 0x00000090 +#define AOFF_mm_swap_address 0x00000084 #define ASIZ_mm_swap_address 0x00000004 -#define AOFF_mm_segments 0x00000094 +#define AOFF_mm_segments 0x00000088 #define ASIZ_mm_segments 0x00000004 #define AOFF_thread_uwinmask 0x00000000 #define ASIZ_thread_uwinmask 0x00000004 diff --git a/include/asm-sparc/bitops.h b/include/asm-sparc/bitops.h index af8d4a2d4..59a57452c 100644 --- a/include/asm-sparc/bitops.h +++ b/include/asm-sparc/bitops.h @@ -8,7 +8,6 @@ #ifndef _SPARC_BITOPS_H #define _SPARC_BITOPS_H -#include <linux/config.h> #include <linux/kernel.h> #include <asm/byteorder.h> diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index fbeaebf2e..436d1a9ad 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h @@ -1,4 +1,4 @@ -/* $Id: elf.h,v 1.21 2000/04/14 09:59:04 davem Exp $ */ +/* $Id: elf.h,v 1.22 2000/07/12 01:27:08 davem Exp $ */ #ifndef __ASMSPARC_ELF_H #define __ASMSPARC_ELF_H diff --git a/include/asm-sparc64/asm_offsets.h b/include/asm-sparc64/asm_offsets.h index 421814863..e191ef259 100644 --- a/include/asm-sparc64/asm_offsets.h +++ b/include/asm-sparc64/asm_offsets.h @@ -85,114 +85,114 @@ #define AOFF_task_pidhash_pprev 0x000000f8 #define ASIZ_task_pidhash_pprev 0x00000008 #define AOFF_task_wait_chldexit 0x00000100 -#define ASIZ_task_wait_chldexit 0x00000028 -#define AOFF_task_vfork_sem 0x00000128 +#define ASIZ_task_wait_chldexit 0x00000018 +#define AOFF_task_vfork_sem 0x00000118 #define ASIZ_task_vfork_sem 0x00000008 -#define AOFF_task_rt_priority 0x00000130 +#define AOFF_task_rt_priority 0x00000120 #define ASIZ_task_rt_priority 0x00000008 -#define AOFF_task_it_real_value 0x00000138 +#define AOFF_task_it_real_value 0x00000128 #define ASIZ_task_it_real_value 0x00000008 -#define AOFF_task_it_prof_value 0x00000140 +#define AOFF_task_it_prof_value 0x00000130 #define ASIZ_task_it_prof_value 0x00000008 -#define AOFF_task_it_virt_value 0x00000148 +#define AOFF_task_it_virt_value 0x00000138 #define ASIZ_task_it_virt_value 0x00000008 -#define AOFF_task_it_real_incr 0x00000150 +#define AOFF_task_it_real_incr 0x00000140 #define ASIZ_task_it_real_incr 0x00000008 -#define AOFF_task_it_prof_incr 0x00000158 +#define AOFF_task_it_prof_incr 0x00000148 #define ASIZ_task_it_prof_incr 0x00000008 -#define AOFF_task_it_virt_incr 0x00000160 +#define AOFF_task_it_virt_incr 0x00000150 #define ASIZ_task_it_virt_incr 0x00000008 -#define AOFF_task_real_timer 0x00000168 +#define AOFF_task_real_timer 0x00000158 #define ASIZ_task_real_timer 0x00000028 -#define AOFF_task_times 0x00000190 +#define AOFF_task_times 0x00000180 #define ASIZ_task_times 0x00000020 -#define AOFF_task_start_time 0x000001b0 +#define AOFF_task_start_time 0x000001a0 #define ASIZ_task_start_time 0x00000008 -#define AOFF_task_per_cpu_utime 0x000001b8 +#define AOFF_task_per_cpu_utime 0x000001a8 #define ASIZ_task_per_cpu_utime 0x00000008 -#define AOFF_task_min_flt 0x000001c8 +#define AOFF_task_min_flt 0x000001b8 #define ASIZ_task_min_flt 0x00000008 -#define AOFF_task_maj_flt 0x000001d0 +#define AOFF_task_maj_flt 0x000001c0 #define ASIZ_task_maj_flt 0x00000008 -#define AOFF_task_nswap 0x000001d8 +#define AOFF_task_nswap 0x000001c8 #define ASIZ_task_nswap 0x00000008 -#define AOFF_task_cmin_flt 0x000001e0 +#define AOFF_task_cmin_flt 0x000001d0 #define ASIZ_task_cmin_flt 0x00000008 -#define AOFF_task_cmaj_flt 0x000001e8 +#define AOFF_task_cmaj_flt 0x000001d8 #define ASIZ_task_cmaj_flt 0x00000008 -#define AOFF_task_cnswap 0x000001f0 +#define AOFF_task_cnswap 0x000001e0 #define ASIZ_task_cnswap 0x00000008 -#define AOFF_task_uid 0x000001fc +#define AOFF_task_uid 0x000001ec #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x00000200 +#define AOFF_task_euid 0x000001f0 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x00000204 +#define AOFF_task_suid 0x000001f4 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000208 +#define AOFF_task_fsuid 0x000001f8 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x0000020c +#define AOFF_task_gid 0x000001fc #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000210 +#define AOFF_task_egid 0x00000200 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x00000214 +#define AOFF_task_sgid 0x00000204 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000218 +#define AOFF_task_fsgid 0x00000208 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x0000021c +#define AOFF_task_ngroups 0x0000020c #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000220 +#define AOFF_task_groups 0x00000210 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x000002a0 +#define AOFF_task_cap_effective 0x00000290 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x000002a4 +#define AOFF_task_cap_inheritable 0x00000294 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000002a8 +#define AOFF_task_cap_permitted 0x00000298 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000002b0 +#define AOFF_task_user 0x000002a0 #define ASIZ_task_user 0x00000008 -#define AOFF_task_rlim 0x000002b8 +#define AOFF_task_rlim 0x000002a8 #define ASIZ_task_rlim 0x000000a0 -#define AOFF_task_used_math 0x00000358 +#define AOFF_task_used_math 0x00000348 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x0000035a +#define AOFF_task_comm 0x0000034a #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x0000036c +#define AOFF_task_link_count 0x0000035c #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000370 +#define AOFF_task_tty 0x00000360 #define ASIZ_task_tty 0x00000008 -#define AOFF_task_semundo 0x00000378 +#define AOFF_task_semundo 0x00000368 #define ASIZ_task_semundo 0x00000008 -#define AOFF_task_semsleeping 0x00000380 +#define AOFF_task_semsleeping 0x00000370 #define ASIZ_task_semsleeping 0x00000008 -#define AOFF_task_thread 0x00000390 +#define AOFF_task_thread 0x00000380 #define ASIZ_task_thread 0x00000450 -#define AOFF_task_fs 0x000007e0 +#define AOFF_task_fs 0x000007d0 #define ASIZ_task_fs 0x00000008 -#define AOFF_task_files 0x000007e8 +#define AOFF_task_files 0x000007d8 #define ASIZ_task_files 0x00000008 -#define AOFF_task_sigmask_lock 0x000007f0 +#define AOFF_task_sigmask_lock 0x000007e0 #define ASIZ_task_sigmask_lock 0x00000004 -#define AOFF_task_sig 0x000007f8 +#define AOFF_task_sig 0x000007e8 #define ASIZ_task_sig 0x00000008 -#define AOFF_task_signal 0x00000800 +#define AOFF_task_signal 0x000007f0 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x00000808 +#define AOFF_task_blocked 0x000007f8 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x00000810 +#define AOFF_task_sigqueue 0x00000800 #define ASIZ_task_sigqueue 0x00000008 -#define AOFF_task_sigqueue_tail 0x00000818 +#define AOFF_task_sigqueue_tail 0x00000808 #define ASIZ_task_sigqueue_tail 0x00000008 -#define AOFF_task_sas_ss_sp 0x00000820 +#define AOFF_task_sas_ss_sp 0x00000810 #define ASIZ_task_sas_ss_sp 0x00000008 -#define AOFF_task_sas_ss_size 0x00000828 +#define AOFF_task_sas_ss_size 0x00000818 #define ASIZ_task_sas_ss_size 0x00000008 -#define AOFF_task_parent_exec_id 0x00000830 +#define AOFF_task_parent_exec_id 0x00000820 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x00000834 +#define AOFF_task_self_exec_id 0x00000824 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000838 +#define AOFF_task_alloc_lock 0x00000828 #define ASIZ_task_alloc_lock 0x00000004 -#define ASIZ_task 0x00000840 +#define ASIZ_task 0x00000830 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000008 #define AOFF_mm_mmap_avl 0x00000008 @@ -208,50 +208,50 @@ #define AOFF_mm_map_count 0x00000028 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x00000030 -#define ASIZ_mm_mmap_sem 0x00000038 -#define AOFF_mm_page_table_lock 0x00000068 +#define ASIZ_mm_mmap_sem 0x00000020 +#define AOFF_mm_page_table_lock 0x00000050 #define ASIZ_mm_page_table_lock 0x00000004 -#define AOFF_mm_context 0x00000070 +#define AOFF_mm_context 0x00000058 #define ASIZ_mm_context 0x00000008 -#define AOFF_mm_start_code 0x00000078 +#define AOFF_mm_start_code 0x00000060 #define ASIZ_mm_start_code 0x00000008 -#define AOFF_mm_end_code 0x00000080 +#define AOFF_mm_end_code 0x00000068 #define ASIZ_mm_end_code 0x00000008 -#define AOFF_mm_start_data 0x00000088 +#define AOFF_mm_start_data 0x00000070 #define ASIZ_mm_start_data 0x00000008 -#define AOFF_mm_end_data 0x00000090 +#define AOFF_mm_end_data 0x00000078 #define ASIZ_mm_end_data 0x00000008 -#define AOFF_mm_start_brk 0x00000098 +#define AOFF_mm_start_brk 0x00000080 #define ASIZ_mm_start_brk 0x00000008 -#define AOFF_mm_brk 0x000000a0 +#define AOFF_mm_brk 0x00000088 #define ASIZ_mm_brk 0x00000008 -#define AOFF_mm_start_stack 0x000000a8 +#define AOFF_mm_start_stack 0x00000090 #define ASIZ_mm_start_stack 0x00000008 -#define AOFF_mm_arg_start 0x000000b0 +#define AOFF_mm_arg_start 0x00000098 #define ASIZ_mm_arg_start 0x00000008 -#define AOFF_mm_arg_end 0x000000b8 +#define AOFF_mm_arg_end 0x000000a0 #define ASIZ_mm_arg_end 0x00000008 -#define AOFF_mm_env_start 0x000000c0 +#define AOFF_mm_env_start 0x000000a8 #define ASIZ_mm_env_start 0x00000008 -#define AOFF_mm_env_end 0x000000c8 +#define AOFF_mm_env_end 0x000000b0 #define ASIZ_mm_env_end 0x00000008 -#define AOFF_mm_rss 0x000000d0 +#define AOFF_mm_rss 0x000000b8 #define ASIZ_mm_rss 0x00000008 -#define AOFF_mm_total_vm 0x000000d8 +#define AOFF_mm_total_vm 0x000000c0 #define ASIZ_mm_total_vm 0x00000008 -#define AOFF_mm_locked_vm 0x000000e0 +#define AOFF_mm_locked_vm 0x000000c8 #define ASIZ_mm_locked_vm 0x00000008 -#define AOFF_mm_def_flags 0x000000e8 +#define AOFF_mm_def_flags 0x000000d0 #define ASIZ_mm_def_flags 0x00000008 -#define AOFF_mm_cpu_vm_mask 0x000000f0 +#define AOFF_mm_cpu_vm_mask 0x000000d8 #define ASIZ_mm_cpu_vm_mask 0x00000008 -#define AOFF_mm_swap_cnt 0x000000f8 +#define AOFF_mm_swap_cnt 0x000000e0 #define ASIZ_mm_swap_cnt 0x00000008 -#define AOFF_mm_swap_address 0x00000100 +#define AOFF_mm_swap_address 0x000000e8 #define ASIZ_mm_swap_address 0x00000008 -#define AOFF_mm_segments 0x00000108 +#define AOFF_mm_segments 0x000000f0 #define ASIZ_mm_segments 0x00000008 -#define ASIZ_mm 0x00000110 +#define ASIZ_mm 0x000000f8 #define AOFF_thread_ksp 0x00000000 #define ASIZ_thread_ksp 0x00000008 #define AOFF_thread_wstate 0x00000008 @@ -379,114 +379,114 @@ #define AOFF_task_pidhash_pprev 0x000000f8 #define ASIZ_task_pidhash_pprev 0x00000008 #define AOFF_task_wait_chldexit 0x00000100 -#define ASIZ_task_wait_chldexit 0x00000028 -#define AOFF_task_vfork_sem 0x00000128 +#define ASIZ_task_wait_chldexit 0x00000018 +#define AOFF_task_vfork_sem 0x00000118 #define ASIZ_task_vfork_sem 0x00000008 -#define AOFF_task_rt_priority 0x00000130 +#define AOFF_task_rt_priority 0x00000120 #define ASIZ_task_rt_priority 0x00000008 -#define AOFF_task_it_real_value 0x00000138 +#define AOFF_task_it_real_value 0x00000128 #define ASIZ_task_it_real_value 0x00000008 -#define AOFF_task_it_prof_value 0x00000140 +#define AOFF_task_it_prof_value 0x00000130 #define ASIZ_task_it_prof_value 0x00000008 -#define AOFF_task_it_virt_value 0x00000148 +#define AOFF_task_it_virt_value 0x00000138 #define ASIZ_task_it_virt_value 0x00000008 -#define AOFF_task_it_real_incr 0x00000150 +#define AOFF_task_it_real_incr 0x00000140 #define ASIZ_task_it_real_incr 0x00000008 -#define AOFF_task_it_prof_incr 0x00000158 +#define AOFF_task_it_prof_incr 0x00000148 #define ASIZ_task_it_prof_incr 0x00000008 -#define AOFF_task_it_virt_incr 0x00000160 +#define AOFF_task_it_virt_incr 0x00000150 #define ASIZ_task_it_virt_incr 0x00000008 -#define AOFF_task_real_timer 0x00000168 +#define AOFF_task_real_timer 0x00000158 #define ASIZ_task_real_timer 0x00000028 -#define AOFF_task_times 0x00000190 +#define AOFF_task_times 0x00000180 #define ASIZ_task_times 0x00000020 -#define AOFF_task_start_time 0x000001b0 +#define AOFF_task_start_time 0x000001a0 #define ASIZ_task_start_time 0x00000008 -#define AOFF_task_per_cpu_utime 0x000001b8 +#define AOFF_task_per_cpu_utime 0x000001a8 #define ASIZ_task_per_cpu_utime 0x00000100 -#define AOFF_task_min_flt 0x000003b8 +#define AOFF_task_min_flt 0x000003a8 #define ASIZ_task_min_flt 0x00000008 -#define AOFF_task_maj_flt 0x000003c0 +#define AOFF_task_maj_flt 0x000003b0 #define ASIZ_task_maj_flt 0x00000008 -#define AOFF_task_nswap 0x000003c8 +#define AOFF_task_nswap 0x000003b8 #define ASIZ_task_nswap 0x00000008 -#define AOFF_task_cmin_flt 0x000003d0 +#define AOFF_task_cmin_flt 0x000003c0 #define ASIZ_task_cmin_flt 0x00000008 -#define AOFF_task_cmaj_flt 0x000003d8 +#define AOFF_task_cmaj_flt 0x000003c8 #define ASIZ_task_cmaj_flt 0x00000008 -#define AOFF_task_cnswap 0x000003e0 +#define AOFF_task_cnswap 0x000003d0 #define ASIZ_task_cnswap 0x00000008 -#define AOFF_task_uid 0x000003ec +#define AOFF_task_uid 0x000003dc #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x000003f0 +#define AOFF_task_euid 0x000003e0 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x000003f4 +#define AOFF_task_suid 0x000003e4 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x000003f8 +#define AOFF_task_fsuid 0x000003e8 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x000003fc +#define AOFF_task_gid 0x000003ec #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000400 +#define AOFF_task_egid 0x000003f0 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x00000404 +#define AOFF_task_sgid 0x000003f4 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000408 +#define AOFF_task_fsgid 0x000003f8 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x0000040c +#define AOFF_task_ngroups 0x000003fc #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000410 +#define AOFF_task_groups 0x00000400 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x00000490 +#define AOFF_task_cap_effective 0x00000480 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x00000494 +#define AOFF_task_cap_inheritable 0x00000484 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x00000498 +#define AOFF_task_cap_permitted 0x00000488 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000004a0 +#define AOFF_task_user 0x00000490 #define ASIZ_task_user 0x00000008 -#define AOFF_task_rlim 0x000004a8 +#define AOFF_task_rlim 0x00000498 #define ASIZ_task_rlim 0x000000a0 -#define AOFF_task_used_math 0x00000548 +#define AOFF_task_used_math 0x00000538 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x0000054a +#define AOFF_task_comm 0x0000053a #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x0000055c +#define AOFF_task_link_count 0x0000054c #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000560 +#define AOFF_task_tty 0x00000550 #define ASIZ_task_tty 0x00000008 -#define AOFF_task_semundo 0x00000568 +#define AOFF_task_semundo 0x00000558 #define ASIZ_task_semundo 0x00000008 -#define AOFF_task_semsleeping 0x00000570 +#define AOFF_task_semsleeping 0x00000560 #define ASIZ_task_semsleeping 0x00000008 -#define AOFF_task_thread 0x00000580 +#define AOFF_task_thread 0x00000570 #define ASIZ_task_thread 0x00000450 -#define AOFF_task_fs 0x000009d0 +#define AOFF_task_fs 0x000009c0 #define ASIZ_task_fs 0x00000008 -#define AOFF_task_files 0x000009d8 +#define AOFF_task_files 0x000009c8 #define ASIZ_task_files 0x00000008 -#define AOFF_task_sigmask_lock 0x000009e0 +#define AOFF_task_sigmask_lock 0x000009d0 #define ASIZ_task_sigmask_lock 0x00000001 -#define AOFF_task_sig 0x000009e8 +#define AOFF_task_sig 0x000009d8 #define ASIZ_task_sig 0x00000008 -#define AOFF_task_signal 0x000009f0 +#define AOFF_task_signal 0x000009e0 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x000009f8 +#define AOFF_task_blocked 0x000009e8 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x00000a00 +#define AOFF_task_sigqueue 0x000009f0 #define ASIZ_task_sigqueue 0x00000008 -#define AOFF_task_sigqueue_tail 0x00000a08 +#define AOFF_task_sigqueue_tail 0x000009f8 #define ASIZ_task_sigqueue_tail 0x00000008 -#define AOFF_task_sas_ss_sp 0x00000a10 +#define AOFF_task_sas_ss_sp 0x00000a00 #define ASIZ_task_sas_ss_sp 0x00000008 -#define AOFF_task_sas_ss_size 0x00000a18 +#define AOFF_task_sas_ss_size 0x00000a08 #define ASIZ_task_sas_ss_size 0x00000008 -#define AOFF_task_parent_exec_id 0x00000a20 +#define AOFF_task_parent_exec_id 0x00000a10 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x00000a24 +#define AOFF_task_self_exec_id 0x00000a14 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000a28 +#define AOFF_task_alloc_lock 0x00000a18 #define ASIZ_task_alloc_lock 0x00000001 -#define ASIZ_task 0x00000a30 +#define ASIZ_task 0x00000a20 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000008 #define AOFF_mm_mmap_avl 0x00000008 @@ -502,50 +502,50 @@ #define AOFF_mm_map_count 0x00000028 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x00000030 -#define ASIZ_mm_mmap_sem 0x00000038 -#define AOFF_mm_page_table_lock 0x00000068 +#define ASIZ_mm_mmap_sem 0x00000020 +#define AOFF_mm_page_table_lock 0x00000050 #define ASIZ_mm_page_table_lock 0x00000001 -#define AOFF_mm_context 0x00000070 +#define AOFF_mm_context 0x00000058 #define ASIZ_mm_context 0x00000008 -#define AOFF_mm_start_code 0x00000078 +#define AOFF_mm_start_code 0x00000060 #define ASIZ_mm_start_code 0x00000008 -#define AOFF_mm_end_code 0x00000080 +#define AOFF_mm_end_code 0x00000068 #define ASIZ_mm_end_code 0x00000008 -#define AOFF_mm_start_data 0x00000088 +#define AOFF_mm_start_data 0x00000070 #define ASIZ_mm_start_data 0x00000008 -#define AOFF_mm_end_data 0x00000090 +#define AOFF_mm_end_data 0x00000078 #define ASIZ_mm_end_data 0x00000008 -#define AOFF_mm_start_brk 0x00000098 +#define AOFF_mm_start_brk 0x00000080 #define ASIZ_mm_start_brk 0x00000008 -#define AOFF_mm_brk 0x000000a0 +#define AOFF_mm_brk 0x00000088 #define ASIZ_mm_brk 0x00000008 -#define AOFF_mm_start_stack 0x000000a8 +#define AOFF_mm_start_stack 0x00000090 #define ASIZ_mm_start_stack 0x00000008 -#define AOFF_mm_arg_start 0x000000b0 +#define AOFF_mm_arg_start 0x00000098 #define ASIZ_mm_arg_start 0x00000008 -#define AOFF_mm_arg_end 0x000000b8 +#define AOFF_mm_arg_end 0x000000a0 #define ASIZ_mm_arg_end 0x00000008 -#define AOFF_mm_env_start 0x000000c0 +#define AOFF_mm_env_start 0x000000a8 #define ASIZ_mm_env_start 0x00000008 -#define AOFF_mm_env_end 0x000000c8 +#define AOFF_mm_env_end 0x000000b0 #define ASIZ_mm_env_end 0x00000008 -#define AOFF_mm_rss 0x000000d0 +#define AOFF_mm_rss 0x000000b8 #define ASIZ_mm_rss 0x00000008 -#define AOFF_mm_total_vm 0x000000d8 +#define AOFF_mm_total_vm 0x000000c0 #define ASIZ_mm_total_vm 0x00000008 -#define AOFF_mm_locked_vm 0x000000e0 +#define AOFF_mm_locked_vm 0x000000c8 #define ASIZ_mm_locked_vm 0x00000008 -#define AOFF_mm_def_flags 0x000000e8 +#define AOFF_mm_def_flags 0x000000d0 #define ASIZ_mm_def_flags 0x00000008 -#define AOFF_mm_cpu_vm_mask 0x000000f0 +#define AOFF_mm_cpu_vm_mask 0x000000d8 #define ASIZ_mm_cpu_vm_mask 0x00000008 -#define AOFF_mm_swap_cnt 0x000000f8 +#define AOFF_mm_swap_cnt 0x000000e0 #define ASIZ_mm_swap_cnt 0x00000008 -#define AOFF_mm_swap_address 0x00000100 +#define AOFF_mm_swap_address 0x000000e8 #define ASIZ_mm_swap_address 0x00000008 -#define AOFF_mm_segments 0x00000108 +#define AOFF_mm_segments 0x000000f0 #define ASIZ_mm_segments 0x00000008 -#define ASIZ_mm 0x00000110 +#define ASIZ_mm 0x000000f8 #define AOFF_thread_ksp 0x00000000 #define ASIZ_thread_ksp 0x00000008 #define AOFF_thread_wstate 0x00000008 @@ -671,114 +671,114 @@ #define AOFF_task_pidhash_pprev 0x000000f8 #define ASIZ_task_pidhash_pprev 0x00000008 #define AOFF_task_wait_chldexit 0x00000100 -#define ASIZ_task_wait_chldexit 0x00000030 -#define AOFF_task_vfork_sem 0x00000130 +#define ASIZ_task_wait_chldexit 0x00000020 +#define AOFF_task_vfork_sem 0x00000120 #define ASIZ_task_vfork_sem 0x00000008 -#define AOFF_task_rt_priority 0x00000138 +#define AOFF_task_rt_priority 0x00000128 #define ASIZ_task_rt_priority 0x00000008 -#define AOFF_task_it_real_value 0x00000140 +#define AOFF_task_it_real_value 0x00000130 #define ASIZ_task_it_real_value 0x00000008 -#define AOFF_task_it_prof_value 0x00000148 +#define AOFF_task_it_prof_value 0x00000138 #define ASIZ_task_it_prof_value 0x00000008 -#define AOFF_task_it_virt_value 0x00000150 +#define AOFF_task_it_virt_value 0x00000140 #define ASIZ_task_it_virt_value 0x00000008 -#define AOFF_task_it_real_incr 0x00000158 +#define AOFF_task_it_real_incr 0x00000148 #define ASIZ_task_it_real_incr 0x00000008 -#define AOFF_task_it_prof_incr 0x00000160 +#define AOFF_task_it_prof_incr 0x00000150 #define ASIZ_task_it_prof_incr 0x00000008 -#define AOFF_task_it_virt_incr 0x00000168 +#define AOFF_task_it_virt_incr 0x00000158 #define ASIZ_task_it_virt_incr 0x00000008 -#define AOFF_task_real_timer 0x00000170 +#define AOFF_task_real_timer 0x00000160 #define ASIZ_task_real_timer 0x00000028 -#define AOFF_task_times 0x00000198 +#define AOFF_task_times 0x00000188 #define ASIZ_task_times 0x00000020 -#define AOFF_task_start_time 0x000001b8 +#define AOFF_task_start_time 0x000001a8 #define ASIZ_task_start_time 0x00000008 -#define AOFF_task_per_cpu_utime 0x000001c0 +#define AOFF_task_per_cpu_utime 0x000001b0 #define ASIZ_task_per_cpu_utime 0x00000100 -#define AOFF_task_min_flt 0x000003c0 +#define AOFF_task_min_flt 0x000003b0 #define ASIZ_task_min_flt 0x00000008 -#define AOFF_task_maj_flt 0x000003c8 +#define AOFF_task_maj_flt 0x000003b8 #define ASIZ_task_maj_flt 0x00000008 -#define AOFF_task_nswap 0x000003d0 +#define AOFF_task_nswap 0x000003c0 #define ASIZ_task_nswap 0x00000008 -#define AOFF_task_cmin_flt 0x000003d8 +#define AOFF_task_cmin_flt 0x000003c8 #define ASIZ_task_cmin_flt 0x00000008 -#define AOFF_task_cmaj_flt 0x000003e0 +#define AOFF_task_cmaj_flt 0x000003d0 #define ASIZ_task_cmaj_flt 0x00000008 -#define AOFF_task_cnswap 0x000003e8 +#define AOFF_task_cnswap 0x000003d8 #define ASIZ_task_cnswap 0x00000008 -#define AOFF_task_uid 0x000003f4 +#define AOFF_task_uid 0x000003e4 #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x000003f8 +#define AOFF_task_euid 0x000003e8 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x000003fc +#define AOFF_task_suid 0x000003ec #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000400 +#define AOFF_task_fsuid 0x000003f0 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x00000404 +#define AOFF_task_gid 0x000003f4 #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000408 +#define AOFF_task_egid 0x000003f8 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x0000040c +#define AOFF_task_sgid 0x000003fc #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000410 +#define AOFF_task_fsgid 0x00000400 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x00000414 +#define AOFF_task_ngroups 0x00000404 #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000418 +#define AOFF_task_groups 0x00000408 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x00000498 +#define AOFF_task_cap_effective 0x00000488 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x0000049c +#define AOFF_task_cap_inheritable 0x0000048c #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000004a0 +#define AOFF_task_cap_permitted 0x00000490 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000004a8 +#define AOFF_task_user 0x00000498 #define ASIZ_task_user 0x00000008 -#define AOFF_task_rlim 0x000004b0 +#define AOFF_task_rlim 0x000004a0 #define ASIZ_task_rlim 0x000000a0 -#define AOFF_task_used_math 0x00000550 +#define AOFF_task_used_math 0x00000540 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x00000552 +#define AOFF_task_comm 0x00000542 #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x00000564 +#define AOFF_task_link_count 0x00000554 #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000568 +#define AOFF_task_tty 0x00000558 #define ASIZ_task_tty 0x00000008 -#define AOFF_task_semundo 0x00000570 +#define AOFF_task_semundo 0x00000560 #define ASIZ_task_semundo 0x00000008 -#define AOFF_task_semsleeping 0x00000578 +#define AOFF_task_semsleeping 0x00000568 #define ASIZ_task_semsleeping 0x00000008 -#define AOFF_task_thread 0x00000580 +#define AOFF_task_thread 0x00000570 #define ASIZ_task_thread 0x00000450 -#define AOFF_task_fs 0x000009d0 +#define AOFF_task_fs 0x000009c0 #define ASIZ_task_fs 0x00000008 -#define AOFF_task_files 0x000009d8 +#define AOFF_task_files 0x000009c8 #define ASIZ_task_files 0x00000008 -#define AOFF_task_sigmask_lock 0x000009e0 +#define AOFF_task_sigmask_lock 0x000009d0 #define ASIZ_task_sigmask_lock 0x0000000c -#define AOFF_task_sig 0x000009f0 +#define AOFF_task_sig 0x000009e0 #define ASIZ_task_sig 0x00000008 -#define AOFF_task_signal 0x000009f8 +#define AOFF_task_signal 0x000009e8 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x00000a00 +#define AOFF_task_blocked 0x000009f0 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x00000a08 +#define AOFF_task_sigqueue 0x000009f8 #define ASIZ_task_sigqueue 0x00000008 -#define AOFF_task_sigqueue_tail 0x00000a10 +#define AOFF_task_sigqueue_tail 0x00000a00 #define ASIZ_task_sigqueue_tail 0x00000008 -#define AOFF_task_sas_ss_sp 0x00000a18 +#define AOFF_task_sas_ss_sp 0x00000a08 #define ASIZ_task_sas_ss_sp 0x00000008 -#define AOFF_task_sas_ss_size 0x00000a20 +#define AOFF_task_sas_ss_size 0x00000a10 #define ASIZ_task_sas_ss_size 0x00000008 -#define AOFF_task_parent_exec_id 0x00000a28 +#define AOFF_task_parent_exec_id 0x00000a18 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x00000a2c +#define AOFF_task_self_exec_id 0x00000a1c #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000a30 +#define AOFF_task_alloc_lock 0x00000a20 #define ASIZ_task_alloc_lock 0x0000000c -#define ASIZ_task 0x00000a40 +#define ASIZ_task 0x00000a30 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000008 #define AOFF_mm_mmap_avl 0x00000008 @@ -794,50 +794,50 @@ #define AOFF_mm_map_count 0x00000028 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x00000030 -#define ASIZ_mm_mmap_sem 0x00000040 -#define AOFF_mm_page_table_lock 0x00000070 +#define ASIZ_mm_mmap_sem 0x00000028 +#define AOFF_mm_page_table_lock 0x00000058 #define ASIZ_mm_page_table_lock 0x0000000c -#define AOFF_mm_context 0x00000080 +#define AOFF_mm_context 0x00000068 #define ASIZ_mm_context 0x00000008 -#define AOFF_mm_start_code 0x00000088 +#define AOFF_mm_start_code 0x00000070 #define ASIZ_mm_start_code 0x00000008 -#define AOFF_mm_end_code 0x00000090 +#define AOFF_mm_end_code 0x00000078 #define ASIZ_mm_end_code 0x00000008 -#define AOFF_mm_start_data 0x00000098 +#define AOFF_mm_start_data 0x00000080 #define ASIZ_mm_start_data 0x00000008 -#define AOFF_mm_end_data 0x000000a0 +#define AOFF_mm_end_data 0x00000088 #define ASIZ_mm_end_data 0x00000008 -#define AOFF_mm_start_brk 0x000000a8 +#define AOFF_mm_start_brk 0x00000090 #define ASIZ_mm_start_brk 0x00000008 -#define AOFF_mm_brk 0x000000b0 +#define AOFF_mm_brk 0x00000098 #define ASIZ_mm_brk 0x00000008 -#define AOFF_mm_start_stack 0x000000b8 +#define AOFF_mm_start_stack 0x000000a0 #define ASIZ_mm_start_stack 0x00000008 -#define AOFF_mm_arg_start 0x000000c0 +#define AOFF_mm_arg_start 0x000000a8 #define ASIZ_mm_arg_start 0x00000008 -#define AOFF_mm_arg_end 0x000000c8 +#define AOFF_mm_arg_end 0x000000b0 #define ASIZ_mm_arg_end 0x00000008 -#define AOFF_mm_env_start 0x000000d0 +#define AOFF_mm_env_start 0x000000b8 #define ASIZ_mm_env_start 0x00000008 -#define AOFF_mm_env_end 0x000000d8 +#define AOFF_mm_env_end 0x000000c0 #define ASIZ_mm_env_end 0x00000008 -#define AOFF_mm_rss 0x000000e0 +#define AOFF_mm_rss 0x000000c8 #define ASIZ_mm_rss 0x00000008 -#define AOFF_mm_total_vm 0x000000e8 +#define AOFF_mm_total_vm 0x000000d0 #define ASIZ_mm_total_vm 0x00000008 -#define AOFF_mm_locked_vm 0x000000f0 +#define AOFF_mm_locked_vm 0x000000d8 #define ASIZ_mm_locked_vm 0x00000008 -#define AOFF_mm_def_flags 0x000000f8 +#define AOFF_mm_def_flags 0x000000e0 #define ASIZ_mm_def_flags 0x00000008 -#define AOFF_mm_cpu_vm_mask 0x00000100 +#define AOFF_mm_cpu_vm_mask 0x000000e8 #define ASIZ_mm_cpu_vm_mask 0x00000008 -#define AOFF_mm_swap_cnt 0x00000108 +#define AOFF_mm_swap_cnt 0x000000f0 #define ASIZ_mm_swap_cnt 0x00000008 -#define AOFF_mm_swap_address 0x00000110 +#define AOFF_mm_swap_address 0x000000f8 #define ASIZ_mm_swap_address 0x00000008 -#define AOFF_mm_segments 0x00000118 +#define AOFF_mm_segments 0x00000100 #define ASIZ_mm_segments 0x00000008 -#define ASIZ_mm 0x00000120 +#define ASIZ_mm 0x00000108 #define AOFF_thread_ksp 0x00000000 #define ASIZ_thread_ksp 0x00000008 #define AOFF_thread_wstate 0x00000008 diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h index 8a5404930..7e3adf02f 100644 --- a/include/asm-sparc64/elf.h +++ b/include/asm-sparc64/elf.h @@ -1,4 +1,4 @@ -/* $Id: elf.h,v 1.24 2000/04/14 09:59:04 davem Exp $ */ +/* $Id: elf.h,v 1.25 2000/07/12 01:27:08 davem Exp $ */ #ifndef __ASM_SPARC64_ELF_H #define __ASM_SPARC64_ELF_H diff --git a/include/asm-sparc64/semaphore.h b/include/asm-sparc64/semaphore.h index 85ae21c9d..5a53d342d 100644 --- a/include/asm-sparc64/semaphore.h +++ b/include/asm-sparc64/semaphore.h @@ -7,6 +7,7 @@ #include <asm/atomic.h> #include <asm/bitops.h> #include <asm/system.h> +#include <linux/wait.h> struct semaphore { atomic_t count; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5610b7fe2..4f00239bf 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -151,7 +151,7 @@ extern struct blk_dev_struct blk_dev[MAX_BLKDEV]; extern void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size); extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size); extern void generic_unplug_device(void *data); -extern int generic_make_request(request_queue_t *q, int rw, +extern void generic_make_request(request_queue_t *q, int rw, struct buffer_head * bh); extern request_queue_t *blk_get_queue(kdev_t dev); extern void blkdev_release_request(struct request *); diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 983295c18..555d38fbe 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -13,6 +13,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * ============================================================================ +* 2000/07/13 acme remove crap #if KERNEL_VERSION > blah * 2000/01/21 acme rename cyclomx_open to cyclomx_mod_inc_use_count * and cyclomx_close to cyclomx_mod_dec_use_count * 1999/05/19 acme wait_queue_head_t wait_stats(support for 2.3.*) @@ -58,11 +59,7 @@ typedef struct cycx { spinlock_t lock; char in_isr; /* interrupt-in-service flag */ char buff_int_mode_unbusy; /* flag for carrying out dev_tint */ -#if (LINUX_VERSION_CODE >= 0x20300) wait_queue_head_t wait_stats; /* to wait for the STATS indication */ -#else - struct wait_queue* wait_stats; /* to wait for the STATS indication */ -#endif u32 mbox; /* -> mailbox */ void (*isr)(struct cycx* card); /* interrupt service routine */ int (*exec)(struct cycx* card, void* u_cmd, void* u_data); diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h index c10a1778e..0ed87cdb4 100644 --- a/include/linux/mtd/doc2000.h +++ b/include/linux/mtd/doc2000.h @@ -2,42 +2,41 @@ /* Linux driver for Disk-On-Chip 2000 */ /* (c) 1999 Machine Vision Holdings, Inc. */ /* Author: David Woodhouse <dwmw2@mvhi.com> */ -/* $Id: doc2000.h,v 1.7 2000/06/26 20:40:53 dwmw2 Exp $ */ +/* $Id: doc2000.h,v 1.8 2000/07/10 15:46:29 dwmw2 Exp $ */ #ifndef __MTD_DOC2000_H__ #define __MTD_DOC2000_H__ #include <linux/mtd/mtd.h> - -#define DoC_M_CDSN_IO 0x800 #define DoC_Sig1 0 #define DoC_Sig2 1 -#define DoC_ChipID 0x1000 -#define DoC_DOCStatus 0x1001 -#define DoC_DOCControl 0x1002 -#define DoC_FloorSelect 0x1003 -#define DoC_CDSNControl 0x1004 -#define DoC_CDSNDeviceSelect 0x1005 -#define DoC_ECCConf 0x1006 -#define DoC_2k_ECCStatus 0x1007 - -#define DoC_CDSNSlowIO 0x100d -#define DoC_ECCSyndrome0 0x1010 -#define DoC_ECCSyndrome1 0x1011 -#define DoC_ECCSyndrome2 0x1012 -#define DoC_ECCSyndrome3 0x1013 -#define DoC_ECCSyndrome4 0x1014 -#define DoC_ECCSyndrome5 0x1015 -#define DoC_AliasResolution 0x101b -#define DoC_ConfigInput 0x101c -#define DoC_ReadPipeInit 0x101d -#define DoC_WritePipeTerm 0x101e -#define DoC_LastDataRead 0x101f -#define DoC_NOP 0x1020 - -#define DoC_2k_CDSN_IO 0x1800 +#define DoC_ChipID 0x1000 +#define DoC_DOCStatus 0x1001 +#define DoC_DOCControl 0x1002 +#define DoC_FloorSelect 0x1003 +#define DoC_CDSNControl 0x1004 +#define DoC_CDSNDeviceSelect 0x1005 +#define DoC_ECCConf 0x1006 +#define DoC_2k_ECCStatus 0x1007 + +#define DoC_CDSNSlowIO 0x100d +#define DoC_ECCSyndrome0 0x1010 +#define DoC_ECCSyndrome1 0x1011 +#define DoC_ECCSyndrome2 0x1012 +#define DoC_ECCSyndrome3 0x1013 +#define DoC_ECCSyndrome4 0x1014 +#define DoC_ECCSyndrome5 0x1015 +#define DoC_AliasResolution 0x101b +#define DoC_ConfigInput 0x101c +#define DoC_ReadPipeInit 0x101d +#define DoC_WritePipeTerm 0x101e +#define DoC_LastDataRead 0x101f +#define DoC_NOP 0x1020 + +#define DoC_Mil_CDSN_IO 0x0800 +#define DoC_2k_CDSN_IO 0x1800 /* How to access the device? * On ARM, it'll be mmap'd directly with 32-bit wide accesses. @@ -54,33 +53,36 @@ #define ReadDOC(adr, reg) readb(((unsigned long)adr) + DoC_##reg) #define WriteDOC(d, adr, reg) writeb(d, ((unsigned long)adr) + DoC_##reg) #endif -#define DOC_MODE_RESET 0 -#define DOC_MODE_NORMAL 1 -#define DOC_MODE_RESERVED1 2 -#define DOC_MODE_RESERVED2 3 - -#define DOC_MODE_MDWREN 4 -#define DOC_MODE_CLR_ERR 0x80 - -#define DOC_ChipID_Doc2k 0x20 -#define DOC_ChipID_DocMil 0x30 - -#define CDSN_CTRL_FR_B 0x80 -#define CDSN_CTRL_ECC_IO 0x20 -#define CDSN_CTRL_FLASH_IO 0x10 -#define CDSN_CTRL_WP 8 -#define CDSN_CTRL_ALE 4 -#define CDSN_CTRL_CLE 2 -#define CDSN_CTRL_CE 1 - -#define DOC_ECC_RESET 0 -#define DOC_ECC_ERROR 0x80 -#define DOC_ECC_RW 0x20 -#define DOC_ECC__EN 0x08 -#define DOC_TOGGLE_BIT 0x04 -#define DOC_ECC_RESV 0x02 + +#define DOC_MODE_RESET 0 +#define DOC_MODE_NORMAL 1 +#define DOC_MODE_RESERVED1 2 +#define DOC_MODE_RESERVED2 3 + +#define DOC_MODE_MDWREN 4 +#define DOC_MODE_CLR_ERR 0x80 + +#define DOC_ChipID_Doc2k 0x20 +#define DOC_ChipID_DocMil 0x30 + +#define CDSN_CTRL_FR_B 0x80 +#define CDSN_CTRL_ECC_IO 0x20 +#define CDSN_CTRL_FLASH_IO 0x10 +#define CDSN_CTRL_WP 0x08 +#define CDSN_CTRL_ALE 0x04 +#define CDSN_CTRL_CLE 0x02 +#define CDSN_CTRL_CE 0x01 + +#define DOC_ECC_RESET 0 +#define DOC_ECC_ERROR 0x80 +#define DOC_ECC_RW 0x20 +#define DOC_ECC__EN 0x08 +#define DOC_TOGGLE_BIT 0x04 +#define DOC_ECC_RESV 0x02 +#define DOC_ECC_IGNORE 0x01 /* We have to also set the reserved bit 1 for enable */ #define DOC_ECC_EN (DOC_ECC__EN | DOC_ECC_RESV) +#define DOC_ECC_DIS (DOC_ECC_IGNORE | DOC_ECC_RESV) struct Nand { char floor, chip; @@ -92,6 +94,9 @@ struct Nand { #define MAX_FLOORS 4 #define MAX_CHIPS 4 +#define MAX_FLOORS_MIL 4 +#define MAX_CHIPS_MIL 1 + struct DiskOnChip { unsigned long physadr; unsigned long virtadr; diff --git a/include/linux/netfilter_ipv4/ip_nat_core.h b/include/linux/netfilter_ipv4/ip_nat_core.h index 28735e0c1..e34e08331 100644 --- a/include/linux/netfilter_ipv4/ip_nat_core.h +++ b/include/linux/netfilter_ipv4/ip_nat_core.h @@ -16,10 +16,10 @@ extern unsigned int do_bindings(struct ip_conntrack *ct, extern struct list_head protos; -extern void icmp_reply_translation(struct sk_buff *skb, - struct ip_conntrack *conntrack, - unsigned int hooknum, - int dir); +extern unsigned int icmp_reply_translation(struct sk_buff *skb, + struct ip_conntrack *conntrack, + unsigned int hooknum, + int dir); extern void replace_in_hashes(struct ip_conntrack *conntrack, struct ip_nat_info *info); diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index c1d6ff312..362f07bee 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -280,7 +280,7 @@ struct ipt_get_entries unsigned int size; /* The entries. */ - unsigned char entries[0]; + struct ipt_entry entrytable[0]; }; /* Standard return verdict, or do jump. */ diff --git a/include/linux/netfilter_ipv4/ipt_REJECT.h b/include/linux/netfilter_ipv4/ipt_REJECT.h index eeafdf468..ad195e435 100644 --- a/include/linux/netfilter_ipv4/ipt_REJECT.h +++ b/include/linux/netfilter_ipv4/ipt_REJECT.h @@ -6,7 +6,10 @@ enum ipt_reject_with { IPT_ICMP_HOST_UNREACHABLE, IPT_ICMP_PROT_UNREACHABLE, IPT_ICMP_PORT_UNREACHABLE, - IPT_ICMP_ECHOREPLY + IPT_ICMP_ECHOREPLY, + IPT_ICMP_NET_PROHIBITED, + IPT_ICMP_HOST_PROHIBITED, + IPT_TCP_RESET }; struct ipt_reject_info { diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index f3617397c..0716ae947 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -286,7 +286,7 @@ struct ip6t_get_entries unsigned int size; /* The entries. */ - unsigned char entries[0]; + struct ip6t_entry entrytable[0]; }; /* Standard return verdict, or do jump. */ diff --git a/include/linux/parport.h b/include/linux/parport.h index 294464b65..27d813e9d 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -309,6 +309,7 @@ struct parport { rwlock_t cad_lock; int spintime; + atomic_t ref_count; }; #define DEFAULT_SPIN_TIME 500 /* us */ @@ -337,12 +338,9 @@ void parport_announce_port (struct parport *port); /* Unregister a port. */ extern void parport_unregister_port(struct parport *port); -/* parport_in_use returns nonzero if there are devices attached to a - port. */ -#define parport_in_use(x) ((x)->devices != NULL) - /* parport_enumerate returns a pointer to the linked list of all the - ports in this machine. */ + ports in this machine. DON'T USE THIS. Use + parport_register_driver instead. */ struct parport *parport_enumerate(void); /* Register a new high-level driver. */ @@ -351,6 +349,15 @@ extern int parport_register_driver (struct parport_driver *); /* Unregister a high-level driver. */ extern void parport_unregister_driver (struct parport_driver *); +/* If parport_register_driver doesn't fit your needs, perhaps + * parport_find_xxx does. */ +extern struct parport *parport_find_number (int); +extern struct parport *parport_find_base (unsigned long); + +/* Reference counting for ports. */ +extern struct parport *parport_get_port (struct parport *); +extern void parport_put_port (struct parport *); + /* parport_register_device declares that a device is connected to a port, and tells the kernel all it needs to know. - pf is the preemption function (may be NULL for no callback) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 04ae938be..a53a165b1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1061,6 +1061,10 @@ #define PCI_DEVICE_ID_LAVA_SSERIAL 0x0500 /* 1x 16550 */ #define PCI_DEVICE_ID_LAVA_PORT_650 0x0600 /* 1x 16650 */ +#define PCI_VENDOR_ID_SYBA 0x1592 +#define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 +#define PCI_DEVICE_ID_SYBA_1P_ECP 0x0783 + #define PCI_DEVICE_ID_LAVA_PARALLEL 0x8000 #define PCI_DEVICE_ID_LAVA_DUAL_PAR_A 0x8002 /* The Lava Dual Parallel is */ #define PCI_DEVICE_ID_LAVA_DUAL_PAR_B 0x8003 /* two PCI devices on a card */ diff --git a/include/linux/poll.h b/include/linux/poll.h index bc0fcde22..64b5df671 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -38,22 +38,13 @@ extern inline void poll_wait(struct file * filp, wait_queue_head_t * wait_addres __pollwait(filp, wait_address, p); } -/* - * For the kernel fd_set we use a fixed set-size for allocation purposes. - * This set-size doesn't necessarily bear any relation to the size the user - * uses, but should preferably obviously be larger than any possible user - * size (NR_OPEN bits). - * - * We need 6 bitmaps (in/out/ex for both incoming and outgoing), and we - * allocate one page for all the bitmaps. Thus we have 8*PAGE_SIZE bits, - * to be divided by 6. And we'd better make sure we round to a full - * long-word (in fact, we'll round to 64 bytes). - */ - +static inline void poll_initwait(poll_table* pt) +{ + pt->error = 0; + pt->table = NULL; +} +extern void poll_freewait(poll_table* pt); -#define KFDS_64BLOCK ((PAGE_SIZE/(6*64))*64) -#define KFDS_NR (KFDS_64BLOCK*8 > NR_OPEN ? NR_OPEN : KFDS_64BLOCK*8) -typedef unsigned long kernel_fd_set[KFDS_NR/__NFDBITS]; /* * Scaleable version of the fd_set. diff --git a/include/linux/usb.h b/include/linux/usb.h index 1b1d3f902..885687193 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -551,6 +551,7 @@ extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, unsigned if extern int usb_register(struct usb_driver *); extern void usb_deregister(struct usb_driver *); +extern void usb_scan_devices(void); /* used these for multi-interface device registration */ extern void usb_driver_claim_interface(struct usb_driver *driver, struct usb_interface *iface, void* priv); diff --git a/include/video/fbcon.h b/include/video/fbcon.h index 796b8f96b..e5f26faa4 100644 --- a/include/video/fbcon.h +++ b/include/video/fbcon.h @@ -229,6 +229,7 @@ extern int set_all_vcs(int fbidx, struct fb_ops *fb, #endif +extern void fbcon_redraw_clear(struct vc_data *, struct display *, int, int, int, int); extern void fbcon_redraw_bmove(struct display *, int, int, int, int, int, int); |