diff options
Diffstat (limited to 'include')
150 files changed, 183 insertions, 546 deletions
diff --git a/include/asm-alpha/mmzone.h b/include/asm-alpha/mmzone.h index 572569df5dd4..4059862d4b3d 100644 --- a/include/asm-alpha/mmzone.h +++ b/include/asm-alpha/mmzone.h @@ -36,18 +36,14 @@ extern plat_pg_data_t *plat_node_data[]; #ifdef CONFIG_ALPHA_WILDFIRE # define ALPHA_PA_TO_NID(pa) ((pa) >> 36) /* 16 nodes max due 43bit kseg */ -#define NODE_MAX_MEM_SIZE (64L * 1024L * 1024L * 1024L) /* 64 GB */ -#define MAX_NUMNODES WILDFIRE_MAX_QBB +# define NODE_MAX_MEM_SIZE (64L * 1024L * 1024L * 1024L) /* 64 GB */ #else # define ALPHA_PA_TO_NID(pa) (0) -#define NODE_MAX_MEM_SIZE (~0UL) -#define MAX_NUMNODES 1 +# define NODE_MAX_MEM_SIZE (~0UL) #endif #define PHYSADDR_TO_NID(pa) ALPHA_PA_TO_NID(pa) #define PLAT_NODE_DATA(n) (plat_node_data[(n)]) -#define PLAT_NODE_DATA_STARTNR(n) \ - (PLAT_NODE_DATA(n)->gendata.node_start_mapnr) #define PLAT_NODE_DATA_SIZE(n) (PLAT_NODE_DATA(n)->gendata.node_size) #if 1 diff --git a/include/asm-alpha/numnodes.h b/include/asm-alpha/numnodes.h new file mode 100644 index 000000000000..4ff6b3ecfbed --- /dev/null +++ b/include/asm-alpha/numnodes.h @@ -0,0 +1,12 @@ +#ifndef _ASM_MAX_NUMNODES_H +#define _ASM_MAX_NUMNODES_H + +/* + * Currently the Wildfire is the only discontigmem/NUMA capable Alpha core. + */ +#if defined(CONFIG_ALPHA_WILDFIRE) || defined(CONFIG_ALPHA_GENERIC) +# include <asm/core_wildfire.h> +# define MAX_NUMNODES WILDFIRE_MAX_QBB +#endif + +#endif /* _ASM_MAX_NUMNODES_H */ diff --git a/include/asm-i386/arch_hooks.h b/include/asm-i386/arch_hooks.h new file mode 100644 index 000000000000..0bf28a32894a --- /dev/null +++ b/include/asm-i386/arch_hooks.h @@ -0,0 +1,25 @@ +#ifndef _ASM_ARCH_HOOKS_H +#define _ASM_ARCH_HOOKS_H + +/* + * linux/include/asm/arch_hooks.h + * + * define the architecture specific hooks + */ + +/* these aren't arch hooks, they are generic routines + * that can be used by the hooks */ +extern void init_ISA_irqs(void); +extern void apic_intr_init(void); +extern void smp_intr_init(void); +extern void timer_interrupt(int irq, void *dev_id, struct pt_regs *regs); + +/* these are the defined hooks */ +extern void intr_init_hook(void); +extern void pre_intr_init_hook(void); +extern void pre_setup_arch_hook(void); +extern void trap_init_hook(void); +extern void time_init_hook(void); +extern void mca_nmi_hook(void); + +#endif diff --git a/include/asm-i386/irq.h b/include/asm-i386/irq.h index 3fc2c070860c..0a5e1dd66212 100644 --- a/include/asm-i386/irq.h +++ b/include/asm-i386/irq.h @@ -12,7 +12,8 @@ #include <linux/config.h> #include <linux/sched.h> -#include <asm/irq_vectors.h> +/* include comes from machine specific directory */ +#include "irq_vectors.h" static __inline__ int irq_cannonicalize(int irq) { diff --git a/include/asm-i386/irq_vectors.h b/include/asm-i386/irq_vectors.h deleted file mode 100644 index 5c53f00e21a8..000000000000 --- a/include/asm-i386/irq_vectors.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef _ASM_IRQ_VECTORS_H -#define _ASM_IRQ_VECTORS_H - -/* - * IDT vectors usable for external interrupt sources start - * at 0x20: - */ -#define FIRST_EXTERNAL_VECTOR 0x20 - -#define SYSCALL_VECTOR 0x80 - -/* - * Vectors 0x20-0x2f are used for ISA interrupts. - */ - -/* - * Special IRQ vectors used by the SMP architecture, 0xf0-0xff - * - * some of the following vectors are 'rare', they are merged - * into a single vector (CALL_FUNCTION_VECTOR) to save vector space. - * TLB, reschedule and local APIC vectors are performance-critical. - * - * Vectors 0xf0-0xfa are free (reserved for future Linux use). - */ -#define SPURIOUS_APIC_VECTOR 0xff -#define ERROR_APIC_VECTOR 0xfe -#define INVALIDATE_TLB_VECTOR 0xfd -#define RESCHEDULE_VECTOR 0xfc -#define CALL_FUNCTION_VECTOR 0xfb - -#define THERMAL_APIC_VECTOR 0xf0 -/* - * Local APIC timer IRQ vector is on a different priority level, - * to work around the 'lost local interrupt if more than 2 IRQ - * sources per level' errata. - */ -#define LOCAL_TIMER_VECTOR 0xef - -/* - * First APIC vector available to drivers: (vectors 0x30-0xee) - * we start at 0x31 to spread out vectors evenly between priority - * levels. (0x80 is the syscall vector) - */ -#define FIRST_DEVICE_VECTOR 0x31 -#define FIRST_SYSTEM_VECTOR 0xef - -#define TIMER_IRQ 0 - -/* - * 16 8259A IRQ's, 208 potential APIC interrupt sources. - * Right now the APIC is mostly only used for SMP. - * 256 vectors is an architectural limit. (we can have - * more than 256 devices theoretically, but they will - * have to use shared interrupts) - * Since vectors 0x00-0x1f are used/reserved for the CPU, - * the usable vector space is 0x20-0xff (224 vectors) - */ -#ifdef CONFIG_X86_IO_APIC -#define NR_IRQS 224 -#else -#define NR_IRQS 16 -#endif - -#endif /* _ASM_IRQ_VECTORS_H */ diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h index d2994f116f03..00a5d7ffbed9 100644 --- a/include/asm-i386/mmzone.h +++ b/include/asm-i386/mmzone.h @@ -6,12 +6,13 @@ #ifndef _ASM_MMZONE_H_ #define _ASM_MMZONE_H_ +#include <asm/smp.h> + #ifdef CONFIG_DISCONTIGMEM #ifdef CONFIG_X86_NUMAQ #include <asm/numaq.h> #else -#define pa_to_nid(pa) (0) #define pfn_to_nid(pfn) (0) #ifdef CONFIG_NUMA #define _cpu_to_node(cpu) 0 @@ -44,7 +45,6 @@ extern struct pglist_data *node_data[]; #define alloc_bootmem_low_pages_node(ignore, x) \ __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) -#define node_startnr(nid) (node_data[nid]->node_start_mapnr) #define node_size(nid) (node_data[nid]->node_size) #define node_localnr(pfn, nid) ((pfn) - node_data[nid]->node_start_pfn) @@ -55,7 +55,7 @@ extern struct pglist_data *node_data[]; /* * Given a kernel address, find the home node of the underlying memory. */ -#define kvaddr_to_nid(kaddr) pa_to_nid(__pa(kaddr)) +#define kvaddr_to_nid(kaddr) pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT) /* * Return a pointer to the node data for node n. @@ -64,6 +64,8 @@ extern struct pglist_data *node_data[]; #define node_mem_map(nid) (NODE_DATA(nid)->node_mem_map) #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) +#define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ + NODE_DATA(nid)->node_size) #define local_mapnr(kvaddr) \ ( (__pa(kvaddr) >> PAGE_SHIFT) - node_start_pfn(kvaddr_to_nid(kvaddr)) ) @@ -74,5 +76,13 @@ extern struct pglist_data *node_data[]; #define pfn_to_page(pfn) (node_mem_map(pfn_to_nid(pfn)) + node_localnr(pfn, pfn_to_nid(pfn))) #define page_to_pfn(page) ((page - page_zone(page)->zone_mem_map) + page_zone(page)->zone_start_pfn) #define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) +/* + * pfn_valid should be made as fast as possible, and the current definition + * is valid for machines that are NUMA, but still contiguous, which is what + * is currently supported. A more generalised, but slower definition would + * be something like this - mbligh: + * ( pfn_to_pgdat(pfn) && (pfn < node_end_pfn(pfn_to_nid(pfn))) ) + */ +#define pfn_valid(pfn) (pfn < num_physpages) #endif /* CONFIG_DISCONTIGMEM */ #endif /* _ASM_MMZONE_H_ */ diff --git a/include/asm-i386/numaq.h b/include/asm-i386/numaq.h index ed10442f1dcc..b32b28c12c73 100644 --- a/include/asm-i386/numaq.h +++ b/include/asm-i386/numaq.h @@ -32,17 +32,18 @@ /* * for now assume that 64Gb is max amount of RAM for whole system - * 64Gb * 1024Mb/Gb = 65536 Mb - * 65536 Mb / 256Mb = 256 + * 64Gb / 4096bytes/page = 16777216 pages */ +#define MAX_NR_PAGES 16777216 #define MAX_ELEMENTS 256 -#define ELEMENT_REPRESENTS 8 /* 256 Mb */ +#define PAGES_PER_ELEMENT (16777216/256) +#define pfn_to_pgdat(pfn) NODE_DATA(pfn_to_nid(pfn)) +#define PHYSADDR_TO_NID(pa) pfn_to_nid(pa >> PAGE_SHIFT) #define MAX_NUMNODES 8 #ifdef CONFIG_NUMA #define _cpu_to_node(cpu) (cpu_to_logical_apicid(cpu) >> 4) #endif /* CONFIG_NUMA */ -extern int pa_to_nid(u64); extern int pfn_to_nid(unsigned long); extern void get_memcfg_numaq(void); #define get_memcfg_numa() get_memcfg_numaq() diff --git a/include/asm-i386/max_numnodes.h b/include/asm-i386/numnodes.h index 2b63299604ef..2b63299604ef 100644 --- a/include/asm-i386/max_numnodes.h +++ b/include/asm-i386/numnodes.h diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h index 5a09fd4b72f1..f9fe284b9057 100644 --- a/include/asm-i386/page.h +++ b/include/asm-i386/page.h @@ -145,10 +145,10 @@ static __inline__ int get_order(unsigned long size) #ifndef CONFIG_DISCONTIGMEM #define pfn_to_page(pfn) (mem_map + (pfn)) #define page_to_pfn(page) ((unsigned long)((page) - mem_map)) +#define pfn_valid(pfn) ((pfn) < max_mapnr) #endif /* !CONFIG_DISCONTIGMEM */ #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) -#define pfn_valid(pfn) ((pfn) < max_mapnr) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ diff --git a/include/asm-mips64/mmzone.h b/include/asm-mips64/mmzone.h index 5e643b114269..d60ad12acd75 100644 --- a/include/asm-mips64/mmzone.h +++ b/include/asm-mips64/mmzone.h @@ -24,7 +24,6 @@ extern plat_pg_data_t *plat_node_data[]; #define PHYSADDR_TO_NID(pa) NASID_TO_COMPACT_NODEID(NASID_GET(pa)) #define PLAT_NODE_DATA(n) (plat_node_data[n]) -#define PLAT_NODE_DATA_STARTNR(n) (PLAT_NODE_DATA(n)->gendata.node_start_mapnr) #define PLAT_NODE_DATA_SIZE(n) (PLAT_NODE_DATA(n)->gendata.node_size) #define PLAT_NODE_DATA_LOCALNR(p, n) \ (((p) >> PAGE_SHIFT) - PLAT_NODE_DATA(n)->gendata.node_start_pfn) diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h index ded7d0a0a986..b32768e57d16 100644 --- a/include/asm-mips64/pgtable.h +++ b/include/asm-mips64/pgtable.h @@ -373,10 +373,10 @@ extern inline void pgd_clear(pgd_t *pgdp) #ifndef CONFIG_DISCONTIGMEM #define pte_page(x) (mem_map+(unsigned long)((pte_val(x) >> PAGE_SHIFT))) #else -#define mips64_pte_pagenr(x) \ - (PLAT_NODE_DATA_STARTNR(PHYSADDR_TO_NID(pte_val(x))) + \ - PLAT_NODE_DATA_LOCALNR(pte_val(x), PHYSADDR_TO_NID(pte_val(x)))) -#define pte_page(x) (mem_map+mips64_pte_pagenr(x)) + +#define pte_page(x) ( NODE_MEM_MAP(PHYSADDR_TO_NID(pte_val(x))) + + PLAT_NODE_DATA_LOCALNR(pte_val(x), PHYSADDR_TO_NID(pte_val(x))) ) + #endif /* diff --git a/include/asm-ppc/8xx_immap.h b/include/asm-ppc/8xx_immap.h index 731a24ffba6c..861fb9278a25 100644 --- a/include/asm-ppc/8xx_immap.h +++ b/include/asm-ppc/8xx_immap.h @@ -1,8 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ - -/* * MPC8xx Internal Memory Map * Copyright (c) 1997 Dan Malek (dmalek@jlc.net) * diff --git a/include/asm-ppc/a.out.h b/include/asm-ppc/a.out.h index 726d11ec8776..eef6a92dda0b 100644 --- a/include/asm-ppc/a.out.h +++ b/include/asm-ppc/a.out.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.a.out.h 1.5 05/17/01 18:14:24 cort - */ #ifndef __PPC_A_OUT_H__ #define __PPC_A_OUT_H__ diff --git a/include/asm-ppc/amigahw.h b/include/asm-ppc/amigahw.h index 43821d6fcb0b..8c98945e7dc1 100644 --- a/include/asm-ppc/amigahw.h +++ b/include/asm-ppc/amigahw.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.amigahw.h 1.5 05/17/01 18:14:24 cort - */ #ifdef __KERNEL__ #ifndef __ASMPPC_AMIGAHW_H #define __ASMPPC_AMIGAHW_H diff --git a/include/asm-ppc/amigaints.h b/include/asm-ppc/amigaints.h index 2e0077946d4c..aa3ff6349e81 100644 --- a/include/asm-ppc/amigaints.h +++ b/include/asm-ppc/amigaints.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* ** amigaints.h -- Amiga Linux interrupt handling structs and prototypes ** ** Copyright 1992 by Greg Harp diff --git a/include/asm-ppc/amigappc.h b/include/asm-ppc/amigappc.h index 58a43e89217b..35114ce5135f 100644 --- a/include/asm-ppc/amigappc.h +++ b/include/asm-ppc/amigappc.h @@ -1,8 +1,5 @@ /* - * BK Id: SCCS/s.amigappc.h 1.5 05/17/01 18:14:24 cort - */ -/* -** asm-m68k/amigappc.h -- This header defines some values and pointers for +** asm-ppc/amigappc.h -- This header defines some values and pointers for ** the Phase 5 PowerUp card. ** ** Copyright 1997, 1998 by Phase5, Germany. diff --git a/include/asm-ppc/amigayle.h b/include/asm-ppc/amigayle.h index d6f07092b289..1fe0b87859b0 100644 --- a/include/asm-ppc/amigayle.h +++ b/include/asm-ppc/amigayle.h @@ -1,4 +1 @@ -/* - * BK Id: SCCS/s.amigayle.h 1.5 05/17/01 18:14:24 cort - */ #include <asm-m68k/amigayle.h> diff --git a/include/asm-ppc/amipcmcia.h b/include/asm-ppc/amipcmcia.h index 2949f68dfa44..3f65f63f508f 100644 --- a/include/asm-ppc/amipcmcia.h +++ b/include/asm-ppc/amipcmcia.h @@ -1,4 +1 @@ -/* - * BK Id: SCCS/s.amipcmcia.h 1.5 05/17/01 18:14:24 cort - */ #include <asm-m68k/amipcmcia.h> diff --git a/include/asm-ppc/atomic.h b/include/asm-ppc/atomic.h index def62e39ca4a..e541fd274241 100644 --- a/include/asm-ppc/atomic.h +++ b/include/asm-ppc/atomic.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * PowerPC atomic operations */ diff --git a/include/asm-ppc/backlight.h b/include/asm-ppc/backlight.h index 76f192e73048..2f070ef6f3f2 100644 --- a/include/asm-ppc/backlight.h +++ b/include/asm-ppc/backlight.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.backlight.h 1.5 05/17/01 18:14:24 cort - */ -/* * Routines for handling backlight control on PowerBooks * * For now, implementation resides in arch/ppc/kernel/pmac_support.c diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h index 13a6bbbb63bc..e65a7f854dfe 100644 --- a/include/asm-ppc/bitops.h +++ b/include/asm-ppc/bitops.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * bitops.h: Bit string operations on the ppc */ diff --git a/include/asm-ppc/bootinfo.h b/include/asm-ppc/bootinfo.h index 2d90dce87f77..213bab4f1481 100644 --- a/include/asm-ppc/bootinfo.h +++ b/include/asm-ppc/bootinfo.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Non-machine dependent bootinfo structure. Basic idea * borrowed from the m68k. * diff --git a/include/asm-ppc/bootx.h b/include/asm-ppc/bootx.h index df86d3a5dae3..90c79cdb795e 100644 --- a/include/asm-ppc/bootx.h +++ b/include/asm-ppc/bootx.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.bootx.h 1.5 05/17/01 18:14:24 cort - */ -/* * This file describes the structure passed from the BootX application * (for MacOS) when it is used to boot Linux. * diff --git a/include/asm-ppc/bseip.h b/include/asm-ppc/bseip.h index 89ade107cae0..691f4a52b0a5 100644 --- a/include/asm-ppc/bseip.h +++ b/include/asm-ppc/bseip.h @@ -1,8 +1,4 @@ /* - * BK Id: SCCS/s.bseip.h 1.10 08/17/01 15:23:17 paulus - */ - -/* * A collection of structures, addresses, and values associated with * the Bright Star Engineering ip-Engine board. Copied from the MBX stuff. * diff --git a/include/asm-ppc/btext.h b/include/asm-ppc/btext.h index 7fc031e1641f..36c7640d00f2 100644 --- a/include/asm-ppc/btext.h +++ b/include/asm-ppc/btext.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Definitions for using the procedures in btext.c. * * Benjamin Herrenschmidt <benh@kernel.crashing.org> diff --git a/include/asm-ppc/bugs.h b/include/asm-ppc/bugs.h index 1dd98bc2c42f..8dce1e290fd0 100644 --- a/include/asm-ppc/bugs.h +++ b/include/asm-ppc/bugs.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.bugs.h 1.5 05/17/01 18:14:24 cort - */ -/* * This file is included by 'init/main.c' */ diff --git a/include/asm-ppc/byteorder.h b/include/asm-ppc/byteorder.h index 3d0b62e6d59c..476852450dc2 100644 --- a/include/asm-ppc/byteorder.h +++ b/include/asm-ppc/byteorder.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _PPC_BYTEORDER_H #define _PPC_BYTEORDER_H diff --git a/include/asm-ppc/cache.h b/include/asm-ppc/cache.h index b2289fe3c207..1f19b8ccffe9 100644 --- a/include/asm-ppc/cache.h +++ b/include/asm-ppc/cache.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * include/asm-ppc/cache.h */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/cacheflush.h b/include/asm-ppc/cacheflush.h index e7918be751ee..5f6665733ed2 100644 --- a/include/asm-ppc/cacheflush.h +++ b/include/asm-ppc/cacheflush.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * include/asm-ppc/cacheflush.h * * This program is free software; you can redistribute it and/or diff --git a/include/asm-ppc/checksum.h b/include/asm-ppc/checksum.h index 0915cd1d0862..2488d535d1ee 100644 --- a/include/asm-ppc/checksum.h +++ b/include/asm-ppc/checksum.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.checksum.h 1.8 05/17/01 18:14:24 cort - */ #ifdef __KERNEL__ #ifndef _PPC_CHECKSUM_H #define _PPC_CHECKSUM_H diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/commproc.h index 5b80101564ee..5f00af151294 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h @@ -1,8 +1,4 @@ /* - * BK Id: SCCS/s.commproc.h 1.16 09/27/01 12:41:09 trini - */ - -/* * MPC8xx Communication Processor Module. * Copyright (c) 1997 Dan Malek (dmalek@jlc.net) * diff --git a/include/asm-ppc/cpm_8260.h b/include/asm-ppc/cpm_8260.h index 35208a9ea712..332ea70daef1 100644 --- a/include/asm-ppc/cpm_8260.h +++ b/include/asm-ppc/cpm_8260.h @@ -1,8 +1,4 @@ /* - * BK Id: SCCS/s.cpm_8260.h 1.7 05/17/01 18:14:24 cort - */ - -/* * MPC8260 Communication Processor Module. * Copyright (c) 1999 Dan Malek (dmalek@jlc.net) * diff --git a/include/asm-ppc/cputable.h b/include/asm-ppc/cputable.h index 2df2962f6ced..2e6b05dded38 100644 --- a/include/asm-ppc/cputable.h +++ b/include/asm-ppc/cputable.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.cputable.h 1.3 08/19/01 22:31:46 paulus - */ -/* * include/asm-ppc/cputable.h * * Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org) diff --git a/include/asm-ppc/current.h b/include/asm-ppc/current.h index a6a29de03c45..8d41501ba10d 100644 --- a/include/asm-ppc/current.h +++ b/include/asm-ppc/current.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.current.h 1.5 05/17/01 18:14:24 cort - */ #ifdef __KERNEL__ #ifndef _PPC_CURRENT_H #define _PPC_CURRENT_H diff --git a/include/asm-ppc/dbdma.h b/include/asm-ppc/dbdma.h index 0a4d8a3e4b7d..6047f288c70b 100644 --- a/include/asm-ppc/dbdma.h +++ b/include/asm-ppc/dbdma.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Definitions for using the Apple Descriptor-Based DMA controller * in Power Macintosh computers. * diff --git a/include/asm-ppc/delay.h b/include/asm-ppc/delay.h index 72bfaa2c1f80..1b02acdb4d0f 100644 --- a/include/asm-ppc/delay.h +++ b/include/asm-ppc/delay.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _PPC_DELAY_H #define _PPC_DELAY_H diff --git a/include/asm-ppc/div64.h b/include/asm-ppc/div64.h index 73e8f77004f6..114e6ab34147 100644 --- a/include/asm-ppc/div64.h +++ b/include/asm-ppc/div64.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.div64.h 1.5 05/17/01 18:14:24 cort - */ #ifndef __PPC_DIV64 #define __PPC_DIV64 diff --git a/include/asm-ppc/dma.h b/include/asm-ppc/dma.h index af24e03b564b..b3707a98ad68 100644 --- a/include/asm-ppc/dma.h +++ b/include/asm-ppc/dma.h @@ -1,8 +1,5 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* - * linux/include/asm/dma.h: Defines for using and allocating dma channels. + * include/asm-ppc/dma.h: Defines for using and allocating dma channels. * Written by Hennus Bergman, 1992. * High DMA channel support & info by Hannu Savolainen * and John Boyd, Nov. 1992. diff --git a/include/asm-ppc/elf.h b/include/asm-ppc/elf.h index 02f0fb08c6bc..af474586135c 100644 --- a/include/asm-ppc/elf.h +++ b/include/asm-ppc/elf.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef __PPC_ELF_H #define __PPC_ELF_H diff --git a/include/asm-ppc/errno.h b/include/asm-ppc/errno.h index 986f531e31b7..f328ba4705f8 100644 --- a/include/asm-ppc/errno.h +++ b/include/asm-ppc/errno.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.errno.h 1.7 05/17/01 18:14:24 cort - */ #ifndef _PPC_ERRNO_H #define _PPC_ERRNO_H diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h index bb9fbc1a51ee..27ae7d2f6af2 100644 --- a/include/asm-ppc/fcntl.h +++ b/include/asm-ppc/fcntl.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.fcntl.h 1.8 09/19/01 23:06:01 paulus - */ #ifndef _PPC_FCNTL_H #define _PPC_FCNTL_H diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h index 758c45756196..44b43dc69f08 100644 --- a/include/asm-ppc/floppy.h +++ b/include/asm-ppc/floppy.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.floppy.h 1.5 05/17/01 18:14:24 cort - */ -/* * Architecture specific parts of the Floppy driver * * This file is subject to the terms and conditions of the GNU General Public diff --git a/include/asm-ppc/gg2.h b/include/asm-ppc/gg2.h index 75bee9608e57..9f43df1fea0c 100644 --- a/include/asm-ppc/gg2.h +++ b/include/asm-ppc/gg2.h @@ -1,8 +1,5 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* - * asm-ppc/gg2.h -- VLSI VAS96011/12 `Golden Gate 2' register definitions + * include/asm-ppc/gg2.h -- VLSI VAS96011/12 `Golden Gate 2' register definitions * * Copyright (C) 1997 Geert Uytterhoeven * diff --git a/include/asm-ppc/hardirq.h b/include/asm-ppc/hardirq.h index 547f2491000f..2d31308d0372 100644 --- a/include/asm-ppc/hardirq.h +++ b/include/asm-ppc/hardirq.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H diff --git a/include/asm-ppc/hdreg.h b/include/asm-ppc/hdreg.h index db83c662f3f0..f616b43235b7 100644 --- a/include/asm-ppc/hdreg.h +++ b/include/asm-ppc/hdreg.h @@ -1,8 +1,5 @@ /* - * BK Id: SCCS/s.hdreg.h 1.5 05/17/01 18:14:24 cort - */ -/* - * linux/include/asm-ppc/hdreg.h + * include/asm-ppc/hdreg.h * * Copyright (C) 1994-1996 Linus Torvalds & authors */ diff --git a/include/asm-ppc/heathrow.h b/include/asm-ppc/heathrow.h index e393fd2d2cd5..22ac179856b9 100644 --- a/include/asm-ppc/heathrow.h +++ b/include/asm-ppc/heathrow.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * heathrow.h: definitions for using the "Heathrow" I/O controller chip. * * Grabbed from Open Firmware definitions on a PowerBook G3 Series diff --git a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h index 98da2dbd2df9..f0adba662e66 100644 --- a/include/asm-ppc/highmem.h +++ b/include/asm-ppc/highmem.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * highmem.h: virtual kernel memory mappings for high memory * * PowerPC version, stolen from the i386 version. diff --git a/include/asm-ppc/hw_irq.h b/include/asm-ppc/hw_irq.h index 492de2c4c536..2abb143721c8 100644 --- a/include/asm-ppc/hw_irq.h +++ b/include/asm-ppc/hw_irq.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu> */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/hydra.h b/include/asm-ppc/hydra.h index a6d29137ac40..1134431431da 100644 --- a/include/asm-ppc/hydra.h +++ b/include/asm-ppc/hydra.h @@ -1,8 +1,5 @@ /* - * BK Id: SCCS/s.hydra.h 1.5 05/17/01 18:14:24 cort - */ -/* - * asm-ppc/hydra.h -- Mac I/O `Hydra' definitions + * include/asm-ppc/hydra.h -- Mac I/O `Hydra' definitions * * Copyright (C) 1997 Geert Uytterhoeven * diff --git a/include/asm-ppc/i8259.h b/include/asm-ppc/i8259.h index e85749f87e31..091b71295de4 100644 --- a/include/asm-ppc/i8259.h +++ b/include/asm-ppc/i8259.h @@ -1,7 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ - #ifndef _PPC_KERNEL_i8259_H #define _PPC_KERNEL_i8259_H diff --git a/include/asm-ppc/ide.h b/include/asm-ppc/ide.h index 558135208705..64078d3d1bb8 100644 --- a/include/asm-ppc/ide.h +++ b/include/asm-ppc/ide.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * linux/include/asm-ppc/ide.h * * Copyright (C) 1994-1996 Linus Torvalds & authors */ diff --git a/include/asm-ppc/immap_8260.h b/include/asm-ppc/immap_8260.h index 9f724ac37098..cee53ba4b78b 100644 --- a/include/asm-ppc/immap_8260.h +++ b/include/asm-ppc/immap_8260.h @@ -1,8 +1,4 @@ /* - * BK Id: SCCS/s.immap_8260.h 1.8 07/18/01 15:46:50 trini - */ - -/* * MPC8260 Internal Memory Map * Copyright (c) 1999 Dan Malek (dmalek@jlc.net) * diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 5c9ad25c7e80..3763b44bc336 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -1,7 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ - #ifdef __KERNEL__ #ifndef _PPC_IO_H #define _PPC_IO_H diff --git a/include/asm-ppc/ioctl.h b/include/asm-ppc/ioctl.h index df4c9d89c751..8785a3a85d26 100644 --- a/include/asm-ppc/ioctl.h +++ b/include/asm-ppc/ioctl.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.ioctl.h 1.5 05/17/01 18:14:24 cort - */ #ifndef _PPC_IOCTL_H #define _PPC_IOCTL_H diff --git a/include/asm-ppc/ioctls.h b/include/asm-ppc/ioctls.h index c5b267501fe5..e700d29fd47e 100644 --- a/include/asm-ppc/ioctls.h +++ b/include/asm-ppc/ioctls.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.ioctls.h 1.7 05/17/01 18:14:24 cort - */ #ifndef _ASM_PPC_IOCTLS_H #define _ASM_PPC_IOCTLS_H diff --git a/include/asm-ppc/ipc.h b/include/asm-ppc/ipc.h index a53986d36ad3..1872790e4042 100644 --- a/include/asm-ppc/ipc.h +++ b/include/asm-ppc/ipc.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.ipc.h 1.5 05/17/01 18:14:24 cort - */ #ifndef __PPC_IPC_H__ #define __PPC_IPC_H__ diff --git a/include/asm-ppc/ipcbuf.h b/include/asm-ppc/ipcbuf.h index 8102001c4c41..fab6752c7480 100644 --- a/include/asm-ppc/ipcbuf.h +++ b/include/asm-ppc/ipcbuf.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.ipcbuf.h 1.5 05/17/01 18:14:24 cort - */ #ifndef __PPC_IPCBUF_H__ #define __PPC_IPCBUF_H__ diff --git a/include/asm-ppc/irq.h b/include/asm-ppc/irq.h index 0c4793570068..911ec8c8ed30 100644 --- a/include/asm-ppc/irq.h +++ b/include/asm-ppc/irq.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H diff --git a/include/asm-ppc/keylargo.h b/include/asm-ppc/keylargo.h index a0bd3eb6fcbe..044337d31d3d 100644 --- a/include/asm-ppc/keylargo.h +++ b/include/asm-ppc/keylargo.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * keylargo.h: definitions for using the "KeyLargo" I/O controller chip. * */ diff --git a/include/asm-ppc/kgdb.h b/include/asm-ppc/kgdb.h index 9ac89318acca..13e09287cae6 100644 --- a/include/asm-ppc/kgdb.h +++ b/include/asm-ppc/kgdb.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * kgdb.h: Defines and declarations for serial line source level * remote debugging of the Linux kernel using gdb. * diff --git a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h index e3745d9e38e3..27f3d6c49ad5 100644 --- a/include/asm-ppc/kmap_types.h +++ b/include/asm-ppc/kmap_types.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _ASM_KMAP_TYPES_H #define _ASM_KMAP_TYPES_H diff --git a/include/asm-ppc/linux_logo.h b/include/asm-ppc/linux_logo.h index 808deee51ee1..e6dad37b9622 100644 --- a/include/asm-ppc/linux_logo.h +++ b/include/asm-ppc/linux_logo.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.linux_logo.h 1.7 05/17/01 18:14:24 cort - */ -/* * include/asm-ppc/linux_logo.h: A linux logo to be displayed on boot * (pinched from the sparc port). * diff --git a/include/asm-ppc/m48t35.h b/include/asm-ppc/m48t35.h index 762f35abb5ef..86b8be5987a8 100644 --- a/include/asm-ppc/m48t35.h +++ b/include/asm-ppc/m48t35.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.m48t35.h 1.8 10/16/01 15:58:42 trini - */ -/* * Registers for the SGS-Thomson M48T35 Timekeeper RAM chip * and * Registers for the SGS-Thomson M48T37 Timekeeper RAM chip diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index 508544127214..900dc172db9c 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _PPC_MACHDEP_H #define _PPC_MACHDEP_H diff --git a/include/asm-ppc/mc146818rtc.h b/include/asm-ppc/mc146818rtc.h index be6c2d3ff78f..227018b2fef8 100644 --- a/include/asm-ppc/mc146818rtc.h +++ b/include/asm-ppc/mc146818rtc.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.mc146818rtc.h 1.5 05/17/01 18:14:25 cort - */ -/* * Machine dependent access functions for RTC registers. */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/md.h b/include/asm-ppc/md.h index 45e77acaa892..0ac10b67b8a4 100644 --- a/include/asm-ppc/md.h +++ b/include/asm-ppc/md.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.md.h 1.5 05/17/01 18:14:25 cort - */ -/* * md.h: High speed xor_block operation for RAID4/5 * */ diff --git a/include/asm-ppc/mediabay.h b/include/asm-ppc/mediabay.h index 653279302c5c..9daa3252d7b6 100644 --- a/include/asm-ppc/mediabay.h +++ b/include/asm-ppc/mediabay.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * mediabay.h: definitions for using the media bay * on PowerBook 3400 and similar computers. * diff --git a/include/asm-ppc/mk48t59.h b/include/asm-ppc/mk48t59.h index bc57b4ce48e0..4700fcdc824c 100644 --- a/include/asm-ppc/mk48t59.h +++ b/include/asm-ppc/mk48t59.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.mk48t59.h 1.5 05/17/01 18:14:25 cort - */ -/* * Registers for the mk48t59 real-time-clock */ diff --git a/include/asm-ppc/mman.h b/include/asm-ppc/mman.h index eb7aba2be87a..6ada70edf9c3 100644 --- a/include/asm-ppc/mman.h +++ b/include/asm-ppc/mman.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.mman.h 1.7 05/17/01 18:14:25 cort - */ #ifndef __PPC_MMAN_H__ #define __PPC_MMAN_H__ diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index 16d5497aa597..7b729cdf52f4 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * PowerPC memory management structures */ diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h index 5b88baf297e3..e1bccc52fc3d 100644 --- a/include/asm-ppc/mmu_context.h +++ b/include/asm-ppc/mmu_context.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef __PPC_MMU_CONTEXT_H #define __PPC_MMU_CONTEXT_H diff --git a/include/asm-ppc/module.h b/include/asm-ppc/module.h index 6f5d55aa0b37..43ddf7c6aaab 100644 --- a/include/asm-ppc/module.h +++ b/include/asm-ppc/module.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.module.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _ASM_PPC_MODULE_H #define _ASM_PPC_MODULE_H /* diff --git a/include/asm-ppc/mpc8260.h b/include/asm-ppc/mpc8260.h index 46e37c8c1cec..d71251294db6 100644 --- a/include/asm-ppc/mpc8260.h +++ b/include/asm-ppc/mpc8260.h @@ -1,7 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ - /* This is the single file included by all MPC8260 build options. * Since there are many different boards and no standard configuration, * we have a unique include file for each. Rather than change every diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index c0022d65fd10..bf7e155027db 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h @@ -1,7 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ - /* This is the single file included by all MPC8xx build options. * Since there are many different boards and no standard configuration, * we have a unique include file for each. Rather than change every diff --git a/include/asm-ppc/msgbuf.h b/include/asm-ppc/msgbuf.h index 01f0127709aa..3432b9b3692e 100644 --- a/include/asm-ppc/msgbuf.h +++ b/include/asm-ppc/msgbuf.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.msgbuf.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _PPC_MSGBUF_H #define _PPC_MSGBUF_H diff --git a/include/asm-ppc/namei.h b/include/asm-ppc/namei.h index b6b7ad622771..29c9ec832133 100644 --- a/include/asm-ppc/namei.h +++ b/include/asm-ppc/namei.h @@ -1,10 +1,8 @@ /* - * BK Id: SCCS/s.namei.h 1.5 05/17/01 18:14:25 cort - */ -/* linux/include/asm-ppc/namei.h - * Adapted from linux/include/asm-alpha/namei.h + * include/asm-ppc/namei.h + * Adapted from include/asm-alpha/namei.h * - * Included from linux/fs/namei.c + * Included from fs/namei.c */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/nvram.h b/include/asm-ppc/nvram.h index 3edb6629d029..7f6fc08b1868 100644 --- a/include/asm-ppc/nvram.h +++ b/include/asm-ppc/nvram.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.nvram.h 1.5 05/17/01 18:14:25 cort - */ -/* * PreP compliant NVRAM access */ diff --git a/include/asm-ppc/ohare.h b/include/asm-ppc/ohare.h index daf5789c7323..a26e350944c5 100644 --- a/include/asm-ppc/ohare.h +++ b/include/asm-ppc/ohare.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * ohare.h: definitions for using the "O'Hare" I/O controller chip. * * Copyright (C) 1997 Paul Mackerras. diff --git a/include/asm-ppc/open_pic.h b/include/asm-ppc/open_pic.h index b22bf942b63d..4e48dc49de5c 100644 --- a/include/asm-ppc/open_pic.h +++ b/include/asm-ppc/open_pic.h @@ -1,8 +1,5 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* - * arch/ppc/kernel/open_pic.h -- OpenPIC Interrupt Handling + * include/asm-ppc/open_pic.h -- OpenPIC Interrupt Handling * * Copyright (C) 1997 Geert Uytterhoeven * diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index 4a2d88d43724..0a7cbc2a3234 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _PPC_PAGE_H #define _PPC_PAGE_H diff --git a/include/asm-ppc/param.h b/include/asm-ppc/param.h index 3d399e0f5b07..a0c23264d9f9 100644 --- a/include/asm-ppc/param.h +++ b/include/asm-ppc/param.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _ASM_PPC_PARAM_H #define _ASM_PPC_PARAM_H diff --git a/include/asm-ppc/parport.h b/include/asm-ppc/parport.h index a775fcded32a..11f96d3de5b6 100644 --- a/include/asm-ppc/parport.h +++ b/include/asm-ppc/parport.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.parport.h 1.5 05/17/01 18:14:25 cort - */ -/* * parport.h: platform-specific PC-style parport initialisation * * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> diff --git a/include/asm-ppc/pc_serial.h b/include/asm-ppc/pc_serial.h index 61020a34f930..fa9cbb67ce3e 100644 --- a/include/asm-ppc/pc_serial.h +++ b/include/asm-ppc/pc_serial.h @@ -1,6 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - * * include/asm-ppc/pc_serial.h * * This is basically a copy of include/asm-i386/serial.h. diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h index 8a9045e024f0..1d7bec303e02 100644 --- a/include/asm-ppc/pci-bridge.h +++ b/include/asm-ppc/pci-bridge.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _ASM_PCI_BRIDGE_H #define _ASM_PCI_BRIDGE_H diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h index 532776aa8687..92118321f0a5 100644 --- a/include/asm-ppc/pci.h +++ b/include/asm-ppc/pci.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef __PPC_PCI_H #define __PPC_PCI_H #ifdef __KERNEL__ diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h index 16f8cb22cf99..da3a16e1d8fd 100644 --- a/include/asm-ppc/pgalloc.h +++ b/include/asm-ppc/pgalloc.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _PPC_PGALLOC_H #define _PPC_PGALLOC_H diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h index 440cffa08cf6..24375161d0e3 100644 --- a/include/asm-ppc/pgtable.h +++ b/include/asm-ppc/pgtable.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _PPC_PGTABLE_H #define _PPC_PGTABLE_H diff --git a/include/asm-ppc/pnp.h b/include/asm-ppc/pnp.h index 9e9118218d95..6f6760b30dd8 100644 --- a/include/asm-ppc/pnp.h +++ b/include/asm-ppc/pnp.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.pnp.h 1.5 05/17/01 18:14:25 cort - */ #ifdef __KERNEL__ /* 11/02/95 */ /*----------------------------------------------------------------------------*/ diff --git a/include/asm-ppc/poll.h b/include/asm-ppc/poll.h index eaadb063cae2..bcec653c14e4 100644 --- a/include/asm-ppc/poll.h +++ b/include/asm-ppc/poll.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.poll.h 1.5 05/17/01 18:14:25 cort - */ #ifndef __PPC_POLL_H #define __PPC_POLL_H diff --git a/include/asm-ppc/posix_types.h b/include/asm-ppc/posix_types.h index 0a44935561ee..f94b4ae6a868 100644 --- a/include/asm-ppc/posix_types.h +++ b/include/asm-ppc/posix_types.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _PPC_POSIX_TYPES_H #define _PPC_POSIX_TYPES_H diff --git a/include/asm-ppc/ppc4xx_pic.h b/include/asm-ppc/ppc4xx_pic.h index f572b180a4b8..a9e936369bdb 100644 --- a/include/asm-ppc/ppc4xx_pic.h +++ b/include/asm-ppc/ppc4xx_pic.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * * Copyright (c) 1999 Grant Erickson <grant@lcse.umn.edu> * diff --git a/include/asm-ppc/ppc_asm.h b/include/asm-ppc/ppc_asm.h index fc8516cb4f12..bbb28c8c5a21 100644 --- a/include/asm-ppc/ppc_asm.h +++ b/include/asm-ppc/ppc_asm.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * include/asm-ppc/ppc_asm.h * * Definitions used by various bits of low-level assembly code on PowerPC. diff --git a/include/asm-ppc/prep_nvram.h b/include/asm-ppc/prep_nvram.h index 23013498b621..85694899c2c2 100644 --- a/include/asm-ppc/prep_nvram.h +++ b/include/asm-ppc/prep_nvram.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.prep_nvram.h 1.7 05/17/01 18:14:25 cort - */ -/* * PreP compliant NVRAM access */ diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index a81936a30473..9f9799457af5 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef __ASM_PPC_PROCESSOR_H #define __ASM_PPC_PROCESSOR_H diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h index 99a9980d3cfe..b3e27a837485 100644 --- a/include/asm-ppc/prom.h +++ b/include/asm-ppc/prom.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Definitions for talking to the Open Firmware PROM on * Power Macintosh computers. * diff --git a/include/asm-ppc/ptrace.h b/include/asm-ppc/ptrace.h index 7a351a43b994..abf24839071e 100644 --- a/include/asm-ppc/ptrace.h +++ b/include/asm-ppc/ptrace.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _PPC_PTRACE_H #define _PPC_PTRACE_H diff --git a/include/asm-ppc/raven.h b/include/asm-ppc/raven.h index 1b9bda3b9fec..66f52cc0a03c 100644 --- a/include/asm-ppc/raven.h +++ b/include/asm-ppc/raven.h @@ -1,8 +1,5 @@ /* - * BK Id: SCCS/s.raven.h 1.7 05/17/01 18:14:25 cort - */ -/* - * asm-ppc/raven.h -- Raven MPIC chip. + * include/asm-ppc/raven.h -- Raven MPIC chip. * * Copyright (C) 1998 Johnnie Peters * diff --git a/include/asm-ppc/residual.h b/include/asm-ppc/residual.h index 1e5f165e19ab..42317589b538 100644 --- a/include/asm-ppc/residual.h +++ b/include/asm-ppc/residual.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.residual.h 1.8 08/09/01 09:11:24 trini - */ /* 7/18/95 */ /*----------------------------------------------------------------------------*/ /* Residual Data header definitions and prototypes */ diff --git a/include/asm-ppc/resource.h b/include/asm-ppc/resource.h index f26ab8754f2f..956b346026c0 100644 --- a/include/asm-ppc/resource.h +++ b/include/asm-ppc/resource.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.resource.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _PPC_RESOURCE_H #define _PPC_RESOURCE_H diff --git a/include/asm-ppc/rwsem.h b/include/asm-ppc/rwsem.h index 5599381abac8..3e738f483c11 100644 --- a/include/asm-ppc/rwsem.h +++ b/include/asm-ppc/rwsem.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * include/asm-ppc/rwsem.h: R/W semaphores for PPC using the stuff * in lib/rwsem.c. Adapted largely from include/asm-i386/rwsem.h * by Paul Mackerras <paulus@samba.org>. diff --git a/include/asm-ppc/scatterlist.h b/include/asm-ppc/scatterlist.h index 5f34a504e038..f21f18f56548 100644 --- a/include/asm-ppc/scatterlist.h +++ b/include/asm-ppc/scatterlist.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _PPC_SCATTERLIST_H #define _PPC_SCATTERLIST_H diff --git a/include/asm-ppc/sections.h b/include/asm-ppc/sections.h index f8e0367fa316..1f2f5fd05966 100644 --- a/include/asm-ppc/sections.h +++ b/include/asm-ppc/sections.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.sections.h 1.11 09/08/01 15:47:43 paulus - */ #ifdef __KERNEL__ #ifndef _PPC_SECTIONS_H #define _PPC_SECTIONS_H diff --git a/include/asm-ppc/segment.h b/include/asm-ppc/segment.h index 374c5fbbd8c2..0f2f7428d437 100644 --- a/include/asm-ppc/segment.h +++ b/include/asm-ppc/segment.h @@ -1,4 +1 @@ -/* - * BK Id: SCCS/s.segment.h 1.7 05/17/01 18:14:25 cort - */ #include <asm/uaccess.h> diff --git a/include/asm-ppc/semaphore.h b/include/asm-ppc/semaphore.h index d7bc76fd84a2..c51eb12c0b87 100644 --- a/include/asm-ppc/semaphore.h +++ b/include/asm-ppc/semaphore.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _PPC_SEMAPHORE_H #define _PPC_SEMAPHORE_H diff --git a/include/asm-ppc/sembuf.h b/include/asm-ppc/sembuf.h index 16c760314d32..d0ab55833134 100644 --- a/include/asm-ppc/sembuf.h +++ b/include/asm-ppc/sembuf.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.sembuf.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _PPC_SEMBUF_H #define _PPC_SEMBUF_H diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h index f0da0bc18dc3..887fa5302a9f 100644 --- a/include/asm-ppc/serial.h +++ b/include/asm-ppc/serial.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * include/asm-ppc/serial.h */ diff --git a/include/asm-ppc/setup.h b/include/asm-ppc/setup.h index 5ba873d060aa..cd458c4f1642 100644 --- a/include/asm-ppc/setup.h +++ b/include/asm-ppc/setup.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.setup.h 1.5 05/17/01 18:14:25 cort - */ #ifdef __KERNEL__ #ifndef _PPC_SETUP_H #define _PPC_SETUP_H diff --git a/include/asm-ppc/shmbuf.h b/include/asm-ppc/shmbuf.h index 472a7d95aef1..ec614e8c6750 100644 --- a/include/asm-ppc/shmbuf.h +++ b/include/asm-ppc/shmbuf.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.shmbuf.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _PPC_SHMBUF_H #define _PPC_SHMBUF_H diff --git a/include/asm-ppc/shmparam.h b/include/asm-ppc/shmparam.h index beb7810cfdf8..d6250602ae64 100644 --- a/include/asm-ppc/shmparam.h +++ b/include/asm-ppc/shmparam.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.shmparam.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _PPC_SHMPARAM_H #define _PPC_SHMPARAM_H diff --git a/include/asm-ppc/sigcontext.h b/include/asm-ppc/sigcontext.h index 73353e849ec7..4bd66a707da9 100644 --- a/include/asm-ppc/sigcontext.h +++ b/include/asm-ppc/sigcontext.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.sigcontext.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _ASM_PPC_SIGCONTEXT_H #define _ASM_PPC_SIGCONTEXT_H diff --git a/include/asm-ppc/siginfo.h b/include/asm-ppc/siginfo.h index 9a80d6a0dd13..4b9435bb9049 100644 --- a/include/asm-ppc/siginfo.h +++ b/include/asm-ppc/siginfo.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.siginfo.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _PPC_SIGINFO_H #define _PPC_SIGINFO_H diff --git a/include/asm-ppc/signal.h b/include/asm-ppc/signal.h index 8f5a07d28d55..4958b3f3547a 100644 --- a/include/asm-ppc/signal.h +++ b/include/asm-ppc/signal.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.signal.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _ASMPPC_SIGNAL_H #define _ASMPPC_SIGNAL_H diff --git a/include/asm-ppc/smp.h b/include/asm-ppc/smp.h index f5e99d565d32..e8c8a89342dd 100644 --- a/include/asm-ppc/smp.h +++ b/include/asm-ppc/smp.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ /* smp.h: PPC specific SMP stuff. * * Original was a copy of sparc smp.h. Now heavily modified diff --git a/include/asm-ppc/socket.h b/include/asm-ppc/socket.h index beccec2431fb..e020c82192dc 100644 --- a/include/asm-ppc/socket.h +++ b/include/asm-ppc/socket.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.socket.h 1.6 05/17/01 18:14:25 cort - */ #ifndef _ASM_SOCKET_H #define _ASM_SOCKET_H diff --git a/include/asm-ppc/sockios.h b/include/asm-ppc/sockios.h index 7b2f459160cb..385aedc55ceb 100644 --- a/include/asm-ppc/sockios.h +++ b/include/asm-ppc/sockios.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.sockios.h 1.5 05/17/01 18:14:25 cort - */ #ifndef _ASM_PPC_SOCKIOS_H #define _ASM_PPC_SOCKIOS_H diff --git a/include/asm-ppc/softirq.h b/include/asm-ppc/softirq.h index 3a95c80a1327..79ccd5db8928 100644 --- a/include/asm-ppc/softirq.h +++ b/include/asm-ppc/softirq.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef __ASM_SOFTIRQ_H #define __ASM_SOFTIRQ_H diff --git a/include/asm-ppc/spinlock.h b/include/asm-ppc/spinlock.h index f852ed60a379..dc961a90643a 100644 --- a/include/asm-ppc/spinlock.h +++ b/include/asm-ppc/spinlock.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef __ASM_SPINLOCK_H #define __ASM_SPINLOCK_H diff --git a/include/asm-ppc/stat.h b/include/asm-ppc/stat.h index 5bc7e2c3618a..ed382adc86d5 100644 --- a/include/asm-ppc/stat.h +++ b/include/asm-ppc/stat.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.stat.h 1.5 05/17/01 18:14:26 cort - */ #ifndef _PPC_STAT_H #define _PPC_STAT_H diff --git a/include/asm-ppc/statfs.h b/include/asm-ppc/statfs.h index 24fa0cb36fec..b2fd73564310 100644 --- a/include/asm-ppc/statfs.h +++ b/include/asm-ppc/statfs.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.statfs.h 1.5 05/17/01 18:14:26 cort - */ #ifndef _PPC_STATFS_H #define _PPC_STATFS_H diff --git a/include/asm-ppc/string.h b/include/asm-ppc/string.h index 2d61719219a5..557e3ad0eee3 100644 --- a/include/asm-ppc/string.h +++ b/include/asm-ppc/string.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.string.h 1.5 05/17/01 18:14:26 cort - */ #ifndef _PPC_STRING_H_ #define _PPC_STRING_H_ diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h index 275e03e10300..58a305b6b0c7 100644 --- a/include/asm-ppc/system.h +++ b/include/asm-ppc/system.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu> */ #ifndef __PPC_SYSTEM_H diff --git a/include/asm-ppc/termbits.h b/include/asm-ppc/termbits.h index a97ea2d23239..52e6d2d52613 100644 --- a/include/asm-ppc/termbits.h +++ b/include/asm-ppc/termbits.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.termbits.h 1.5 05/17/01 18:14:26 cort - */ #ifndef _PPC_TERMBITS_H #define _PPC_TERMBITS_H diff --git a/include/asm-ppc/termios.h b/include/asm-ppc/termios.h index 7d103fff1ec7..fe999e9cbca4 100644 --- a/include/asm-ppc/termios.h +++ b/include/asm-ppc/termios.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.termios.h 1.8 05/17/01 18:14:26 cort - */ #ifndef _PPC_TERMIOS_H #define _PPC_TERMIOS_H diff --git a/include/asm-ppc/time.h b/include/asm-ppc/time.h index d0ab15f30168..4ae422ca1383 100644 --- a/include/asm-ppc/time.h +++ b/include/asm-ppc/time.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * Common time prototypes and such for all ppc machines. * * Written by Cort Dougan (cort@fsmlabs.com) to merge diff --git a/include/asm-ppc/timex.h b/include/asm-ppc/timex.h index c2eb9f7abf58..65192b74ef06 100644 --- a/include/asm-ppc/timex.h +++ b/include/asm-ppc/timex.h @@ -1,8 +1,5 @@ /* - * BK Id: SCCS/s.timex.h 1.8 08/15/01 22:43:07 paulus - */ -/* - * linux/include/asm-ppc/timex.h + * include/asm-ppc/timex.h * * ppc architecture timex specifications */ diff --git a/include/asm-ppc/tlbflush.h b/include/asm-ppc/tlbflush.h index 9c06b88c45d9..9c9e21c3bb15 100644 --- a/include/asm-ppc/tlbflush.h +++ b/include/asm-ppc/tlbflush.h @@ -1,7 +1,4 @@ /* - * BK Id: %F% %I% %G% %U% %#% - */ -/* * include/asm-ppc/tlbflush.h * * This program is free software; you can redistribute it and/or diff --git a/include/asm-ppc/traps.h b/include/asm-ppc/traps.h index 5e63cdde2d87..68e7326b56f1 100644 --- a/include/asm-ppc/traps.h +++ b/include/asm-ppc/traps.h @@ -1,4 +1 @@ -/* - * BK Id: SCCS/s.traps.h 1.5 05/17/01 18:14:26 cort - */ #include <asm-m68k/traps.h> diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h index f4ce6ebda385..2b048ca98e73 100644 --- a/include/asm-ppc/types.h +++ b/include/asm-ppc/types.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.types.h 1.10 10/15/01 22:51:33 paulus - */ #ifndef _PPC_TYPES_H #define _PPC_TYPES_H diff --git a/include/asm-ppc/uaccess.h b/include/asm-ppc/uaccess.h index 0087efbb0d6a..1931d72ce8a9 100644 --- a/include/asm-ppc/uaccess.h +++ b/include/asm-ppc/uaccess.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifdef __KERNEL__ #ifndef _PPC_UACCESS_H #define _PPC_UACCESS_H diff --git a/include/asm-ppc/ucontext.h b/include/asm-ppc/ucontext.h index a4f7d3ee1d84..3d60332a3a44 100644 --- a/include/asm-ppc/ucontext.h +++ b/include/asm-ppc/ucontext.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.ucontext.h 1.5 05/17/01 18:14:26 cort - */ #ifndef _ASMPPC_UCONTEXT_H #define _ASMPPC_UCONTEXT_H diff --git a/include/asm-ppc/unaligned.h b/include/asm-ppc/unaligned.h index d4f61dc0755e..797ffd6e4e1b 100644 --- a/include/asm-ppc/unaligned.h +++ b/include/asm-ppc/unaligned.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.unaligned.h 1.5 05/17/01 18:14:26 cort - */ #ifdef __KERNEL__ #ifndef __PPC_UNALIGNED_H #define __PPC_UNALIGNED_H diff --git a/include/asm-ppc/uninorth.h b/include/asm-ppc/uninorth.h index 15f5659fdd1a..111a1113938b 100644 --- a/include/asm-ppc/uninorth.h +++ b/include/asm-ppc/uninorth.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.uninorth.h 1.13 10/23/01 08:09:35 trini - */ -/* * uninorth.h: definitions for using the "UniNorth" host bridge chip * from Apple. This chip is used on "Core99" machines * diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h index 510bfd1772c2..9d8e3a4de7bd 100644 --- a/include/asm-ppc/unistd.h +++ b/include/asm-ppc/unistd.h @@ -1,6 +1,3 @@ -/* - * BK Id: %F% %I% %G% %U% %#% - */ #ifndef _ASM_PPC_UNISTD_H_ #define _ASM_PPC_UNISTD_H_ diff --git a/include/asm-ppc/user.h b/include/asm-ppc/user.h index 10f95d59feaf..d662b2151370 100644 --- a/include/asm-ppc/user.h +++ b/include/asm-ppc/user.h @@ -1,6 +1,3 @@ -/* - * BK Id: SCCS/s.user.h 1.5 05/17/01 18:14:26 cort - */ #ifdef __KERNEL__ #ifndef _PPC_USER_H #define _PPC_USER_H diff --git a/include/asm-ppc/vga.h b/include/asm-ppc/vga.h index 34afea0e8f73..c5864734e3e1 100644 --- a/include/asm-ppc/vga.h +++ b/include/asm-ppc/vga.h @@ -1,7 +1,4 @@ /* - * BK Id: SCCS/s.vga.h 1.5 05/17/01 18:14:26 cort - */ -/* * Access to VGA videoram * * (c) 1998 Martin Mares <mj@ucw.cz> diff --git a/include/asm-ppc/xor.h b/include/asm-ppc/xor.h index d0835e364a00..c82eb12a5b18 100644 --- a/include/asm-ppc/xor.h +++ b/include/asm-ppc/xor.h @@ -1,4 +1 @@ -/* - * BK Id: SCCS/s.xor.h 1.5 05/17/01 18:14:26 cort - */ #include <asm-generic/xor.h> diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h index d45bd823c1cb..b7edad3a52c6 100644 --- a/include/asm-sparc64/system.h +++ b/include/asm-sparc64/system.h @@ -152,24 +152,6 @@ do { spin_unlock_irq(&(prev)->switch_lock); \ #define task_running(rq, p) \ ((rq)->curr == (p) || spin_is_locked(&(p)->switch_lock)) -#ifndef CONFIG_DEBUG_SPINLOCK -#define CHECK_LOCKS(PREV) do { } while(0) -#else /* CONFIG_DEBUG_SPINLOCK */ -#define CHECK_LOCKS(PREV) \ -if ((PREV)->thread.smp_lock_count) { \ - unsigned long rpc; \ - __asm__ __volatile__("mov %%i7, %0" : "=r" (rpc)); \ - printk(KERN_CRIT "(%s)[%d]: Sleeping with %d locks held!\n", \ - (PREV)->comm, (PREV)->pid, \ - (PREV)->thread.smp_lock_count); \ - printk(KERN_CRIT "(%s)[%d]: Last lock at %08x\n", \ - (PREV)->comm, (PREV)->pid, \ - (PREV)->thread.smp_lock_pc); \ - printk(KERN_CRIT "(%s)[%d]: Sched caller %016lx\n", \ - (PREV)->comm, (PREV)->pid, rpc); \ -} -#endif /* !(CONFIG_DEBUG_SPINLOCK) */ - /* See what happens when you design the chip correctly? * * We tell gcc we clobber all non-fixed-usage registers except @@ -180,8 +162,7 @@ if ((PREV)->thread.smp_lock_count) { \ * and 2 stores in this critical code path. -DaveM */ #define switch_to(prev, next, last) \ -do { CHECK_LOCKS(prev); \ - if (test_thread_flag(TIF_PERFCTR)) { \ +do { if (test_thread_flag(TIF_PERFCTR)) { \ unsigned long __tmp; \ read_pcr(__tmp); \ current_thread_info()->pcr_reg = __tmp; \ diff --git a/include/linux/fs.h b/include/linux/fs.h index 804ea47301f5..56f2bab87d7f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -279,6 +279,7 @@ struct iattr { */ struct page; struct address_space; +struct writeback_control; struct address_space_operations { int (*writepage)(struct page *); @@ -286,10 +287,10 @@ struct address_space_operations { int (*sync_page)(struct page *); /* Write back some dirty pages from this mapping. */ - int (*writepages)(struct address_space *, int *nr_to_write); + int (*writepages)(struct address_space *, struct writeback_control *); /* Perform a writeback as a memory-freeing operation. */ - int (*vm_writeback)(struct page *, int *nr_to_write); + int (*vm_writeback)(struct page *, struct writeback_control *); /* Set a page dirty */ int (*set_page_dirty)(struct page *page); @@ -1259,7 +1260,8 @@ extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin); extern loff_t remote_llseek(struct file *file, loff_t offset, int origin); extern int generic_file_open(struct inode * inode, struct file * filp); -extern int generic_vm_writeback(struct page *page, int *nr_to_write); +extern int generic_vm_writeback(struct page *page, + struct writeback_control *wbc); extern struct file_operations generic_ro_fops; diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 10021357c093..437572e2240b 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -39,18 +39,25 @@ * can allocate highmem pages, the *get*page*() variants return * virtual kernel addresses to the allocated page(s). */ -extern struct page * FASTCALL(_alloc_pages(unsigned int gfp_mask, unsigned int order)); extern struct page * FASTCALL(__alloc_pages(unsigned int gfp_mask, unsigned int order, struct zonelist *zonelist)); extern struct page * alloc_pages_node(int nid, unsigned int gfp_mask, unsigned int order); +/* + * We get the zone list from the current node and the gfp_mask. + * This zone list contains a maximum of MAXNODES*MAX_NR_ZONES zones. + * + * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets + * optimized to &contig_page_data at compile-time. + */ static inline struct page * alloc_pages(unsigned int gfp_mask, unsigned int order) { - /* - * Gets optimized away by the compiler. - */ - if (order >= MAX_ORDER) + pg_data_t *pgdat = NODE_DATA(numa_node_id()); + unsigned int idx = (gfp_mask & GFP_ZONEMASK); + + if (unlikely(order >= MAX_ORDER)) return NULL; - return _alloc_pages(gfp_mask, order); + + return __alloc_pages(gfp_mask, order, pgdat->node_zonelists + idx); } #define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7483c39e28dd..c63e4947387f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -15,7 +15,10 @@ #include <linux/rbtree.h> #include <linux/fs.h> +#ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ extern unsigned long max_mapnr; +#endif + extern unsigned long num_physpages; extern void * high_memory; extern int page_cluster; @@ -345,8 +348,10 @@ static inline int page_mapped(struct page *page) #define VM_FAULT_MINOR 1 #define VM_FAULT_MAJOR 2 -/* The array of struct pages */ +#ifndef CONFIG_DISCONTIGMEM +/* The array of struct pages - for discontigmem use pgdat->lmem_map */ extern struct page *mem_map; +#endif extern void show_free_areas(void); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 8ebf441bdb47..580c39c4dcc1 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -10,11 +10,14 @@ #include <linux/wait.h> #include <linux/cache.h> #include <asm/atomic.h> +#ifdef CONFIG_DISCONTIGMEM +#include <asm/numnodes.h> +#endif +#ifndef MAX_NUMNODES +#define MAX_NUMNODES 1 +#endif -/* - * Free memory management - zoned buddy allocator. - */ - +/* Free memory management - zoned buddy allocator. */ #ifndef CONFIG_FORCE_MAX_ZONEORDER #define MAX_ORDER 11 #else @@ -112,7 +115,6 @@ struct zone { struct page *zone_mem_map; /* zone_start_pfn == zone_start_paddr >> PAGE_SHIFT */ unsigned long zone_start_pfn; - unsigned long zone_start_mapnr; /* * rarely used fields: @@ -138,7 +140,7 @@ struct zone { * footprint of this construct is very small. */ struct zonelist { - struct zone *zones[MAX_NR_ZONES+1]; // NULL delimited + struct zone *zones[MAX_NUMNODES * MAX_NR_ZONES + 1]; // NULL delimited }; #define GFP_ZONEMASK 0x0f @@ -163,7 +165,6 @@ typedef struct pglist_data { unsigned long *valid_addr_bitmap; struct bootmem_data *bdata; unsigned long node_start_pfn; - unsigned long node_start_mapnr; unsigned long node_size; int node_id; struct pglist_data *pgdat_next; @@ -187,10 +188,12 @@ memclass(struct zone *pgzone, struct zone *classzone) * prototypes for the discontig memory code. */ struct page; -void free_area_init_core(int nid, pg_data_t *pgdat, struct page **gmap, - unsigned long *zones_size, unsigned long paddr, unsigned long *zholes_size, - struct page *pmap); +extern void calculate_totalpages (pg_data_t *pgdat, unsigned long *zones_size, + unsigned long *zholes_size); +extern void free_area_init_core(pg_data_t *pgdat, unsigned long *zones_size, + unsigned long *zholes_size); void get_zone_counts(unsigned long *active, unsigned long *inactive); +extern void build_all_zonelists(void); extern pg_data_t contig_page_data; diff --git a/include/linux/mpage.h b/include/linux/mpage.h index 52253d90f55d..86aa7b676274 100644 --- a/include/linux/mpage.h +++ b/include/linux/mpage.h @@ -10,14 +10,16 @@ * nested includes. Get it right in the .c file). */ +struct writeback_control; + int mpage_readpages(struct address_space *mapping, struct list_head *pages, unsigned nr_pages, get_block_t get_block); int mpage_readpage(struct page *page, get_block_t get_block); int mpage_writepages(struct address_space *mapping, - int *nr_to_write, get_block_t get_block); + struct writeback_control *wbc, get_block_t get_block); static inline int -generic_writepages(struct address_space *mapping, int *nr_to_write) +generic_writepages(struct address_space *mapping, struct writeback_control *wbc) { - return mpage_writepages(mapping, nr_to_write, NULL); + return mpage_writepages(mapping, wbc, NULL); } diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 3127165e7c13..9fd7d5c05605 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -128,7 +128,6 @@ enum KERN_TAINTED=53, /* int: various kernel tainted flags */ KERN_CADPID=54, /* int: PID of the process to notify on CAD */ KERN_PIDMAX=55, /* int: PID # limit */ - KERN_HUGETLB_PAGE_NUM=56, /* int: Number of available Huge Pages */ }; @@ -147,12 +146,12 @@ enum VM_PAGE_CLUSTER=10, /* int: set number of pages to swap together */ VM_DIRTY_BACKGROUND=11, /* dirty_background_ratio */ VM_DIRTY_ASYNC=12, /* dirty_async_ratio */ - VM_DIRTY_SYNC=13, /* dirty_sync_ratio */ - VM_DIRTY_WB_CS=14, /* dirty_writeback_centisecs */ - VM_DIRTY_EXPIRE_CS=15, /* dirty_expire_centisecs */ - VM_NR_PDFLUSH_THREADS=16, /* nr_pdflush_threads */ - VM_OVERCOMMIT_RATIO=17, /* percent of RAM to allow overcommit in */ - VM_PAGEBUF=18 /* struct: Control pagebuf parameters */ + VM_DIRTY_WB_CS=13, /* dirty_writeback_centisecs */ + VM_DIRTY_EXPIRE_CS=14, /* dirty_expire_centisecs */ + VM_NR_PDFLUSH_THREADS=15, /* nr_pdflush_threads */ + VM_OVERCOMMIT_RATIO=16, /* percent of RAM to allow overcommit in */ + VM_PAGEBUF=17, /* struct: Control pagebuf parameters */ + VM_HUGETLB_PAGES=18, /* int: Number of available Huge Pages */ }; diff --git a/include/linux/uio.h b/include/linux/uio.h index ec098c8e6793..85b2f0ec9d3f 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -35,7 +35,11 @@ struct iovec #endif /* - * Total number of bytes covered by an iovec + * Total number of bytes covered by an iovec. + * + * NOTE that it is not safe to use this function until all the iovec's + * segment lengths have been validated. Because the individual lengths can + * overflow a size_t when added together. */ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs) { diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 5de884cd6a7c..c35b96eb6a90 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -27,22 +27,29 @@ static inline int current_is_pdflush(void) * fs/fs-writeback.c */ enum writeback_sync_modes { - WB_SYNC_NONE = 0, /* Don't wait on anything */ - WB_SYNC_LAST = 1, /* Wait on the last-written mapping */ - WB_SYNC_ALL = 2, /* Wait on every mapping */ - WB_SYNC_HOLD = 3, /* Hold the inode on sb_dirty for sys_sync() */ + WB_SYNC_NONE, /* Don't wait on anything */ + WB_SYNC_ALL, /* Wait on every mapping */ + WB_SYNC_HOLD, /* Hold the inode on sb_dirty for sys_sync() */ }; -void writeback_unlocked_inodes(int *nr_to_write, - enum writeback_sync_modes sync_mode, - unsigned long *older_than_this); +/* + * A control structure which tells the writeback code what to do + */ +struct writeback_control { + struct backing_dev_info *bdi; /* If !NULL, only write back this + queue */ + enum writeback_sync_modes sync_mode; + unsigned long *older_than_this; /* If !NULL, only write back inodes + older than this */ + long nr_to_write; /* Write this many pages, and decrement + this for each page written */ +}; + +void writeback_inodes(struct writeback_control *wbc); void wake_up_inode(struct inode *inode); void __wait_on_inode(struct inode * inode); void sync_inodes_sb(struct super_block *, int wait); void sync_inodes(int wait); -void writeback_backing_dev(struct backing_dev_info *bdi, int *nr_to_write, - enum writeback_sync_modes sync_mode, - unsigned long *older_than_this); /* writeback.h requires fs.h; it, too, is not included from here. */ static inline void wait_on_inode(struct inode *inode) @@ -57,7 +64,6 @@ static inline void wait_on_inode(struct inode *inode) /* These 5 are exported to sysctl. */ extern int dirty_background_ratio; extern int dirty_async_ratio; -extern int dirty_sync_ratio; extern int dirty_writeback_centisecs; extern int dirty_expire_centisecs; @@ -65,7 +71,7 @@ extern int dirty_expire_centisecs; void balance_dirty_pages(struct address_space *mapping); void balance_dirty_pages_ratelimited(struct address_space *mapping); int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0); -int do_writepages(struct address_space *mapping, int *nr_to_write); +int do_writepages(struct address_space *mapping, struct writeback_control *wbc); /* pdflush.c */ extern int nr_pdflush_threads; /* Global so it can be exported to sysctl diff --git a/include/net/ax25.h b/include/net/ax25.h index 334127932384..c34da24f1902 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -3,11 +3,14 @@ * * Alan Cox (GW4PTS) 10/11/93 */ - #ifndef _AX25_H #define _AX25_H + #include <linux/config.h> #include <linux/ax25.h> +#include <linux/spinlock.h> +#include <linux/timer.h> +#include <asm/atomic.h> #define AX25_T1CLAMPLO 1 #define AX25_T1CLAMPHI (30 * HZ) @@ -66,6 +69,8 @@ #define AX25_UA 0x63 /* Unnumbered acknowledge */ #define AX25_FRMR 0x87 /* Frame reject */ #define AX25_UI 0x03 /* Unnumbered information */ +#define AX25_XID 0xaf /* Exchange information */ +#define AX25_TEST 0xe3 /* Test */ #define AX25_PF 0x10 /* Poll/final bit for standard AX.25 */ #define AX25_EPF 0x01 /* Poll/final bit for extended AX.25 */ @@ -147,10 +152,12 @@ typedef struct { typedef struct ax25_route { struct ax25_route *next; + atomic_t ref; ax25_address callsign; - struct net_device *dev; + struct net_device *dev; ax25_digi *digipeat; char ip_mode; + struct timer_list timer; } ax25_route; typedef struct { @@ -197,11 +204,12 @@ typedef struct ax25_cb { #define ax25_sk(__sk) ((ax25_cb *)(__sk)->protinfo) /* af_ax25.c */ -extern ax25_cb *volatile ax25_list; +extern ax25_cb *ax25_list; +extern spinlock_t ax25_list_lock; extern void ax25_free_cb(ax25_cb *); extern void ax25_insert_socket(ax25_cb *); struct sock *ax25_find_listener(ax25_address *, int, struct net_device *, int); -struct sock *ax25_find_socket(ax25_address *, ax25_address *, int); +struct sock *ax25_get_socket(ax25_address *, ax25_address *, int); extern ax25_cb *ax25_find_cb(ax25_address *, ax25_address *, ax25_digi *, struct net_device *); extern struct sock *ax25_addr_match(ax25_address *); extern void ax25_send_to_raw(struct sock *, struct sk_buff *, int); @@ -224,6 +232,7 @@ extern void ax25_digi_invert(ax25_digi *, ax25_digi *); /* ax25_dev.c */ extern ax25_dev *ax25_dev_list; +extern spinlock_t ax25_dev_lock; extern ax25_dev *ax25_dev_ax25dev(struct net_device *); extern ax25_dev *ax25_addr_ax25dev(ax25_address *); extern void ax25_dev_device_up(struct net_device *); @@ -286,10 +295,16 @@ extern void ax25_rt_device_down(struct net_device *); extern int ax25_rt_ioctl(unsigned int, void *); extern int ax25_rt_get_info(char *, char **, off_t, int); extern int ax25_rt_autobind(ax25_cb *, ax25_address *); -extern ax25_route *ax25_rt_find_route(ax25_address *, struct net_device *); +extern ax25_route *ax25_rt_find_route(ax25_route *, ax25_address *, + struct net_device *); extern struct sk_buff *ax25_rt_build_path(struct sk_buff *, ax25_address *, ax25_address *, ax25_digi *); extern void ax25_rt_free(void); +static inline void ax25_put_route(ax25_route *ax25_rt) +{ + atomic_dec(&ax25_rt->ref); +} + /* ax25_std_in.c */ extern int ax25_std_frame_in(ax25_cb *, struct sk_buff *, int); diff --git a/include/net/llc_actn.h b/include/net/llc_actn.h index 28d2873f5065..3619601c4c81 100644 --- a/include/net/llc_actn.h +++ b/include/net/llc_actn.h @@ -45,4 +45,5 @@ extern int llc_station_ac_report_status(struct llc_station *station, struct sk_buff *skb); extern int llc_station_ac_report_status(struct llc_station *station, struct sk_buff *skb); +extern void llc_station_ack_tmr_cb(unsigned long timeout_data); #endif /* LLC_ACTN_H */ diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h index 1d2facdf212b..221899a24530 100644 --- a/include/net/llc_c_ac.h +++ b/include/net/llc_c_ac.h @@ -211,4 +211,9 @@ extern int llc_conn_ac_send_i_rsp_f_set_ackpf(struct sock* sk, struct sk_buff *skb); extern int llc_conn_ac_send_i_rsp_as_ack(struct sock* sk, struct sk_buff *skb); extern int llc_conn_ac_send_i_as_ack(struct sock* sk, struct sk_buff *skb); + +extern void llc_conn_busy_tmr_cb(unsigned long timeout_data); +extern void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data); +extern void llc_conn_ack_tmr_cb(unsigned long timeout_data); +extern void llc_conn_rej_tmr_cb(unsigned long timeout_data); #endif /* LLC_C_AC_H */ diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h index 5fe315ebcc7c..795cb74166a5 100644 --- a/include/net/llc_c_ev.h +++ b/include/net/llc_c_ev.h @@ -11,6 +11,9 @@ * * See the GNU General Public License for more details. */ + +#include <net/sock.h> + /* Connection component state transition event qualifiers */ /* Types of events (possible values in 'ev->type') */ #define LLC_CONN_EV_TYPE_SIMPLE 1 @@ -293,4 +296,10 @@ extern int llc_conn_ev_qlfy_set_status_conflict(struct sock *sk, struct sk_buff *skb); extern int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk, struct sk_buff *skb); + +static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb) +{ + return atomic_read(&sk->rmem_alloc) + skb->truesize < + (unsigned)sk->rcvbuf; +} #endif /* LLC_C_EV_H */ diff --git a/include/net/llc_main.h b/include/net/llc_main.h index e3b0c7a09caa..25d486278da4 100644 --- a/include/net/llc_main.h +++ b/include/net/llc_main.h @@ -16,7 +16,7 @@ #define LLC_TYPE_1 1 #define LLC_TYPE_2 2 #define LLC_P_TIME 2 -#define LLC_ACK_TIME 3 +#define LLC_ACK_TIME 1 #define LLC_REJ_TIME 3 #define LLC_BUSY_TIME 3 #define LLC_DEST_INVALID 0 /* Invalid LLC PDU type */ |