mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
193 lines
5.2 KiB
C
193 lines
5.2 KiB
C
/*
|
|
* linux/arch/m68knommu/mm/init.c
|
|
*
|
|
* Copyright (C) 1998 D. Jeff Dionne <jeff@lineo.ca>,
|
|
* Kenneth Albanowski <kjahds@kjahds.com>,
|
|
* Copyright (C) 2000 Lineo, Inc. (www.lineo.com)
|
|
*
|
|
* Based on:
|
|
*
|
|
* linux/arch/m68k/mm/init.c
|
|
*
|
|
* Copyright (C) 1995 Hamish Macdonald
|
|
*
|
|
* JAN/1999 -- hacked to support ColdFire (gerg@snapgear.com)
|
|
* DEC/2000 -- linux 2.4 support <davidm@snapgear.com>
|
|
*/
|
|
|
|
#include <linux/signal.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
#include <linux/types.h>
|
|
#include <linux/ptrace.h>
|
|
#include <linux/mman.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/init.h>
|
|
#include <linux/highmem.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/gfp.h>
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/segment.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/system.h>
|
|
#include <asm/machdep.h>
|
|
|
|
#undef DEBUG
|
|
|
|
extern void die_if_kernel(char *,struct pt_regs *,long);
|
|
extern void free_initmem(void);
|
|
|
|
/*
|
|
* BAD_PAGE is the page that is used for page faults when linux
|
|
* is out-of-memory. Older versions of linux just did a
|
|
* do_exit(), but using this instead means there is less risk
|
|
* for a process dying in kernel mode, possibly leaving a inode
|
|
* unused etc..
|
|
*
|
|
* BAD_PAGETABLE is the accompanying page-table: it is initialized
|
|
* to point to BAD_PAGE entries.
|
|
*
|
|
* ZERO_PAGE is a special page that is used for zero-initialized
|
|
* data and COW.
|
|
*/
|
|
static unsigned long empty_bad_page_table;
|
|
|
|
static unsigned long empty_bad_page;
|
|
|
|
unsigned long empty_zero_page;
|
|
|
|
extern unsigned long memory_start;
|
|
extern unsigned long memory_end;
|
|
|
|
/*
|
|
* paging_init() continues the virtual memory environment setup which
|
|
* was begun by the code in arch/head.S.
|
|
* The parameters are pointers to where to stick the starting and ending
|
|
* addresses of available kernel virtual memory.
|
|
*/
|
|
void __init paging_init(void)
|
|
{
|
|
/*
|
|
* Make sure start_mem is page aligned, otherwise bootmem and
|
|
* page_alloc get different views of the world.
|
|
*/
|
|
#ifdef DEBUG
|
|
unsigned long start_mem = PAGE_ALIGN(memory_start);
|
|
#endif
|
|
unsigned long end_mem = memory_end & PAGE_MASK;
|
|
|
|
#ifdef DEBUG
|
|
printk (KERN_DEBUG "start_mem is %#lx\nvirtual_end is %#lx\n",
|
|
start_mem, end_mem);
|
|
#endif
|
|
|
|
/*
|
|
* Initialize the bad page table and bad page to point
|
|
* to a couple of allocated pages.
|
|
*/
|
|
empty_bad_page_table = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
|
|
empty_bad_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
|
|
empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
|
|
memset((void *)empty_zero_page, 0, PAGE_SIZE);
|
|
|
|
/*
|
|
* Set up SFC/DFC registers (user data space).
|
|
*/
|
|
set_fs (USER_DS);
|
|
|
|
#ifdef DEBUG
|
|
printk (KERN_DEBUG "before free_area_init\n");
|
|
|
|
printk (KERN_DEBUG "free_area_init -> start_mem is %#lx\nvirtual_end is %#lx\n",
|
|
start_mem, end_mem);
|
|
#endif
|
|
|
|
{
|
|
unsigned long zones_size[MAX_NR_ZONES] = {0, };
|
|
|
|
zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
|
|
free_area_init(zones_size);
|
|
}
|
|
}
|
|
|
|
void __init mem_init(void)
|
|
{
|
|
int codek = 0, datak = 0, initk = 0;
|
|
unsigned long tmp;
|
|
extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end;
|
|
extern unsigned int _ramend, _rambase;
|
|
unsigned long len = _ramend - _rambase;
|
|
unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
|
|
unsigned long end_mem = memory_end; /* DAVIDM - this must not include kernel stack at top */
|
|
|
|
pr_debug("Mem_init: start=%lx, end=%lx\n", start_mem, end_mem);
|
|
|
|
end_mem &= PAGE_MASK;
|
|
high_memory = (void *) end_mem;
|
|
|
|
start_mem = PAGE_ALIGN(start_mem);
|
|
max_mapnr = num_physpages = (((unsigned long) high_memory) - PAGE_OFFSET) >> PAGE_SHIFT;
|
|
|
|
/* this will put all memory onto the freelists */
|
|
totalram_pages = free_all_bootmem();
|
|
|
|
codek = (&_etext - &_stext) >> 10;
|
|
datak = (&_ebss - &_sdata) >> 10;
|
|
initk = (&__init_begin - &__init_end) >> 10;
|
|
|
|
tmp = nr_free_pages() << PAGE_SHIFT;
|
|
printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",
|
|
tmp >> 10,
|
|
len >> 10,
|
|
codek,
|
|
datak
|
|
);
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
void free_initrd_mem(unsigned long start, unsigned long end)
|
|
{
|
|
int pages = 0;
|
|
for (; start < end; start += PAGE_SIZE) {
|
|
ClearPageReserved(virt_to_page(start));
|
|
init_page_count(virt_to_page(start));
|
|
free_page(start);
|
|
totalram_pages++;
|
|
pages++;
|
|
}
|
|
printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
|
|
}
|
|
#endif
|
|
|
|
void
|
|
free_initmem()
|
|
{
|
|
#ifdef CONFIG_RAMKERNEL
|
|
unsigned long addr;
|
|
extern char __init_begin, __init_end;
|
|
/*
|
|
* The following code should be cool even if these sections
|
|
* are not page aligned.
|
|
*/
|
|
addr = PAGE_ALIGN((unsigned long)(&__init_begin));
|
|
/* next to check that the page we free is not a partial page */
|
|
for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) {
|
|
ClearPageReserved(virt_to_page(addr));
|
|
init_page_count(virt_to_page(addr));
|
|
free_page(addr);
|
|
totalram_pages++;
|
|
}
|
|
printk(KERN_NOTICE "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
|
|
(addr - PAGE_ALIGN((long) &__init_begin)) >> 10,
|
|
(int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
|
|
(int)(addr - PAGE_SIZE));
|
|
#endif
|
|
}
|
|
|