mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
5a0e3ad6af
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>
173 lines
4.4 KiB
C
173 lines
4.4 KiB
C
/*
|
|
* misc.c
|
|
*
|
|
* This is a collection of several routines from gzip-1.0.3
|
|
* adapted for Linux.
|
|
*
|
|
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
|
*
|
|
* Modified for ARM Linux by Russell King
|
|
*
|
|
* Nicolas Pitre <nico@visuaide.com> 1999/04/14 :
|
|
* For this code to run directly from Flash, all constant variables must
|
|
* be marked with 'const' and all other variables initialized at run-time
|
|
* only. This way all non constant variables will end up in the bss segment,
|
|
* which should point to addresses in RAM and cleared to 0 on start.
|
|
* This allows for a much quicker boot time.
|
|
*
|
|
* Modified for Alpha, from the ARM version, by Jay Estabrook 2003.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#define memzero(s,n) memset ((s),0,(n))
|
|
#define puts srm_printk
|
|
extern long srm_printk(const char *, ...)
|
|
__attribute__ ((format (printf, 1, 2)));
|
|
|
|
/*
|
|
* gzip delarations
|
|
*/
|
|
#define OF(args) args
|
|
#define STATIC static
|
|
|
|
typedef unsigned char uch;
|
|
typedef unsigned short ush;
|
|
typedef unsigned long ulg;
|
|
|
|
#define WSIZE 0x8000 /* Window size must be at least 32k, */
|
|
/* and a power of two */
|
|
|
|
static uch *inbuf; /* input buffer */
|
|
static uch *window; /* Sliding window buffer */
|
|
|
|
static unsigned insize; /* valid bytes in inbuf */
|
|
static unsigned inptr; /* index of next byte to be processed in inbuf */
|
|
static unsigned outcnt; /* bytes in output buffer */
|
|
|
|
/* gzip flag byte */
|
|
#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
|
|
#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
|
|
#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
|
|
#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
|
|
#define COMMENT 0x10 /* bit 4 set: file comment present */
|
|
#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
|
|
#define RESERVED 0xC0 /* bit 6,7: reserved */
|
|
|
|
#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf())
|
|
|
|
/* Diagnostic functions */
|
|
#ifdef DEBUG
|
|
# define Assert(cond,msg) {if(!(cond)) error(msg);}
|
|
# define Trace(x) fprintf x
|
|
# define Tracev(x) {if (verbose) fprintf x ;}
|
|
# define Tracevv(x) {if (verbose>1) fprintf x ;}
|
|
# define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
|
|
# define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
|
|
#else
|
|
# define Assert(cond,msg)
|
|
# define Trace(x)
|
|
# define Tracev(x)
|
|
# define Tracevv(x)
|
|
# define Tracec(c,x)
|
|
# define Tracecv(c,x)
|
|
#endif
|
|
|
|
static int fill_inbuf(void);
|
|
static void flush_window(void);
|
|
static void error(char *m);
|
|
|
|
static char *input_data;
|
|
static int input_data_size;
|
|
|
|
static uch *output_data;
|
|
static ulg output_ptr;
|
|
static ulg bytes_out;
|
|
|
|
static void error(char *m);
|
|
static void gzip_mark(void **);
|
|
static void gzip_release(void **);
|
|
|
|
extern int end;
|
|
static ulg free_mem_ptr;
|
|
static ulg free_mem_end_ptr;
|
|
|
|
#define HEAP_SIZE 0x3000
|
|
|
|
#include "../../../lib/inflate.c"
|
|
|
|
/* ===========================================================================
|
|
* Fill the input buffer. This is called only when the buffer is empty
|
|
* and at least one byte is really needed.
|
|
*/
|
|
int fill_inbuf(void)
|
|
{
|
|
if (insize != 0)
|
|
error("ran out of input data");
|
|
|
|
inbuf = input_data;
|
|
insize = input_data_size;
|
|
|
|
inptr = 1;
|
|
return inbuf[0];
|
|
}
|
|
|
|
/* ===========================================================================
|
|
* Write the output window window[0..outcnt-1] and update crc and bytes_out.
|
|
* (Used for the decompressed data only.)
|
|
*/
|
|
void flush_window(void)
|
|
{
|
|
ulg c = crc;
|
|
unsigned n;
|
|
uch *in, *out, ch;
|
|
|
|
in = window;
|
|
out = &output_data[output_ptr];
|
|
for (n = 0; n < outcnt; n++) {
|
|
ch = *out++ = *in++;
|
|
c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
|
|
}
|
|
crc = c;
|
|
bytes_out += (ulg)outcnt;
|
|
output_ptr += (ulg)outcnt;
|
|
outcnt = 0;
|
|
/* puts("."); */
|
|
}
|
|
|
|
static void error(char *x)
|
|
{
|
|
puts("\n\n");
|
|
puts(x);
|
|
puts("\n\n -- System halted");
|
|
|
|
while(1); /* Halt */
|
|
}
|
|
|
|
unsigned int
|
|
decompress_kernel(void *output_start,
|
|
void *input_start,
|
|
size_t ksize,
|
|
size_t kzsize)
|
|
{
|
|
output_data = (uch *)output_start;
|
|
input_data = (uch *)input_start;
|
|
input_data_size = kzsize; /* use compressed size */
|
|
|
|
/* FIXME FIXME FIXME */
|
|
free_mem_ptr = (ulg)output_start + ksize;
|
|
free_mem_end_ptr = (ulg)output_start + ksize + 0x200000;
|
|
/* FIXME FIXME FIXME */
|
|
|
|
/* put in temp area to reduce initial footprint */
|
|
window = malloc(WSIZE);
|
|
|
|
makecrc();
|
|
/* puts("Uncompressing Linux..."); */
|
|
gunzip();
|
|
/* puts(" done, booting the kernel.\n"); */
|
|
return output_ptr;
|
|
}
|