Skip to content

L
linux
Commit 62401684 authored by Steve French's avatar Steve French
Browse files
Options

Merge bk://linux.bkbits.net/linux-2.5 

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs
parents 34c044fa ed158dc1
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 201 deletions
Documentation/kbuild/modules.txt
View file @ 62401684
......@@ -23,7 +23,7 @@ with changes in the build system the most portable way to compile a
module outside the kernel is to use the kernel build system,
kbuild. Use the following command-line:
make -C path/to/kernel/src SUBDIRS=$PWD modules
make -C path/to/kernel/src M=$PWD modules
This requires that a makefile exits made in accordance to
Documentation/kbuild/makefiles.txt. Read that file for more details on
......@@ -65,4 +65,4 @@ yourmodule-objs := file1.o file2.o file3.o
# Invokes the kernel build system to come back to the current
# directory and build yourmodule.ko.
default:
make -C ${KERNEL_SOURCE} SUBDIRS=`pwd` modules
make -C ${KERNEL_SOURCE} M=`pwd` modules
Makefile
View file @ 62401684
......@@ -53,7 +53,7 @@ ifndef KBUILD_CHECKSRC
KBUILD_CHECKSRC = 0
endif
# Use make M=dir to specify direcotry of external module to build
# Use make M=dir to specify directory of external module to build
# Old syntax make ... SUBDIRS=$PWD is still supported
# Setting the environment variable KBUILD_EXTMOD take precedence
ifdef SUBDIRS
......@@ -130,16 +130,6 @@ else
_all: modules
endif
# Make sure we're not wasting cpu-cycles doing locale handling, yet do make
# sure error messages appear in the user-desired language
ifdef LC_ALL
LANG := $(LC_ALL)
LC_ALL :=
endif
LC_COLLATE := C
LC_CTYPE := C
export LANG LC_ALL LC_COLLATE LC_CTYPE
srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
TOPDIR := $(srctree)
# FIXME - TOPDIR is obsolete, use srctree/objtree
......@@ -621,25 +611,44 @@ vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
# Handle descending into subdirectories listed in $(vmlinux-dirs)
# Handle descending into subdirectories listed in $(vmlinux-dirs)
# Preset locale variables to speed up the build process. Limit locale
# tweaks to this spot to avoid wrong language settings when running
# make menuconfig etc.
# Error messages still appears in the original language
.PHONY: $(vmlinux-dirs)
$(vmlinux-dirs): prepare-all scripts
$(Q)$(MAKE) $(build)=$@
$(Q)if [ ! -z $$LC_ALL ]; then \
export LANG=$$LC_ALL; \
export LC_ALL= ; \
fi; \
export LC_COLLATE=C; export LC_CTYPE=C; \
$(MAKE) $(build)=$@
# Things we need to do before we recursively start building the kernel
# or the modules are listed in "prepare-all".
# A multi level approach is used. prepare1 is updated first, then prepare0.
# prepare-all is the collection point for the prepare targets.
.PHONY: prepare-all prepare prepare0 prepare1
.PHONY: prepare-all prepare prepare0 prepare1 prepare2
# prepare 2 generate Makefile to be placed in output directory, if
# using a seperate output directory. This allows convinient use
# of make in output directory
prepare2:
$(Q)if [ ! $(srctree) -ef $(objtree) ]; then \
$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
$(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) \
> $(objtree)/Makefile; \
fi
# prepare1 is used to check if we are building in a separate output directory,
# and if so do:
# 1) Check that make has not been executed in the kernel src $(srctree)
# 2) Create the include2 directory, used for the second asm symlink
prepare1:
prepare1: prepare2
ifneq ($(KBUILD_SRC),)
@echo ' Using $(srctree) as source for kernel'
$(Q)if [ -h $(srctree)/include/asm -o -f $(srctree)/.config ]; then \
......@@ -760,9 +769,13 @@ _modinst_:
sleep 1; \
fi
@rm -rf $(MODLIB)/kernel
@rm -f $(MODLIB)/build
@rm -f $(MODLIB)/source
@mkdir -p $(MODLIB)/kernel
@ln -s $(TOPDIR) $(MODLIB)/build
@ln -s $(srctree) $(MODLIB)/source
@if [ ! $(objtree) -ef $(MODLIB)/build ]; then \
rm -f $(MODLIB)/build ; \
ln -s $(objtree) $(MODLIB)/build ; \
fi
$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst
# If System.map exists, run depmod. This deliberately does not have a
......@@ -1009,19 +1022,19 @@ endif # KBUILD_EXTMOD
# ---------------------------------------------------------------------------
define all-sources
( find . $(RCS_FIND_IGNORE) \
( find $(srctree) $(RCS_FIND_IGNORE) \
\( -name include -o -name arch \) -prune -o \
-name '*.[chS]' -print; \
find arch/$(ARCH) $(RCS_FIND_IGNORE) \
find $(srctree)/arch/$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
find security/selinux/include $(RCS_FIND_IGNORE) \
find $(srctree)/security/selinux/include $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
find include $(RCS_FIND_IGNORE) \
find $(srctree)/include $(RCS_FIND_IGNORE) \
\( -name config -o -name 'asm-*' \) -prune \
-o -name '*.[chS]' -print; \
find include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
find $(srctree)/include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
find include/asm-generic $(RCS_FIND_IGNORE) \
find $(srctree)/include/asm-generic $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print )
endef
......
arch/ppc/Makefile
View file @ 62401684
......@@ -22,7 +22,7 @@ endif
LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
CPPFLAGS += -Iarch/$(ARCH)
AFLAGS += -Iarch/$(ARCH)
aflags-y += -Iarch/$(ARCH)
cflags-y += -Iarch/$(ARCH) -msoft-float -pipe \
-ffixed-r2 -Wno-uninitialized -mmultiple
CPP = $(CC) -E $(CFLAGS)
......@@ -33,10 +33,16 @@ ifndef CONFIG_E500
cflags-y += -mstring
endif
aflags-$(CONFIG_4xx) += -m405
cflags-$(CONFIG_4xx) += -Wa,-m405
aflags-$(CONFIG_6xx) += -maltivec
cflags-$(CONFIG_6xx) += -Wa,-maltivec
aflags-$(CONFIG_E500) += -me500
cflags-$(CONFIG_E500) += -Wa,-me500
aflags-$(CONFIG_PPC64BRIDGE) += -mppc64bridge
cflags-$(CONFIG_PPC64BRIDGE) += -Wa,-mppc64bridge
AFLAGS += $(aflags-y)
CFLAGS += $(cflags-y)
head-y := arch/ppc/kernel/head.o
......
drivers/base/Kconfig
View file @ 62401684
menu "Generic Driver Options"
config STANDALONE
bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
default y
help
Select this option if you don't have magic firmware for drivers that
need it.
If unsure, say Y.
config PREVENT_FIRMWARE_BUILD
bool "Prevent firmware from being built"
default y
......
include/linux/mm.h
View file @ 62401684
......@@ -706,8 +706,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
extern struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr);
extern unsigned int nr_used_zone_pages(void);
extern struct page * vmalloc_to_page(void *addr);
extern struct page * follow_page(struct mm_struct *mm, unsigned long address,
int write);
......
init/Kconfig
View file @ 62401684
......@@ -41,15 +41,6 @@ config CLEAN_COMPILE
If unsure, say Y
config STANDALONE
bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
default y
help
Select this option if you don't have magic firmware for drivers that
need it.
If unsure, say Y.
config BROKEN
bool
depends on !CLEAN_COMPILE
......
mm/page_alloc.c
View file @ 62401684
......@@ -825,17 +825,6 @@ unsigned int nr_free_pages(void)
EXPORT_SYMBOL(nr_free_pages);
unsigned int nr_used_zone_pages(void)
{
unsigned int pages = 0;
struct zone *zone;
for_each_zone(zone)
pages += zone->nr_active + zone->nr_inactive;
return pages;
}
#ifdef CONFIG_NUMA
unsigned int nr_free_pages_pgdat(pg_data_t *pgdat)
{
......
mm/vmscan.c
View file @ 62401684
......@@ -169,22 +169,25 @@ EXPORT_SYMBOL(remove_shrinker);
* slab to avoid swapping.
*
* We do weird things to avoid (scanned*seeks*entries) overflowing 32 bits.
*
* `lru_pages' represents the number of on-LRU pages in all the zones which
* are eligible for the caller's allocation attempt. It is used for balancing
* slab reclaim versus page reclaim.
*/
static int shrink_slab(unsigned long scanned, unsigned int gfp_mask)
static int shrink_slab(unsigned long scanned, unsigned int gfp_mask,
unsigned long lru_pages)
{
struct shrinker *shrinker;
long pages;
if (down_trylock(&shrinker_sem))
return 0;
pages = nr_used_zone_pages();
list_for_each_entry(shrinker, &shrinker_list, list) {
unsigned long long delta;
delta = (4 * scanned) / shrinker->seeks;
delta *= (*shrinker->shrinker)(0, gfp_mask);
do_div(delta, pages + 1);
do_div(delta, lru_pages + 1);
shrinker->nr += delta;
if (shrinker->nr < 0)
shrinker->nr = LONG_MAX; /* It wrapped! */
......@@ -896,6 +899,7 @@ int try_to_free_pages(struct zone **zones,
int total_scanned = 0, total_reclaimed = 0;
struct reclaim_state *reclaim_state = current->reclaim_state;
struct scan_control sc;
unsigned long lru_pages = 0;
int i;
sc.gfp_mask = gfp_mask;
......@@ -903,8 +907,12 @@ int try_to_free_pages(struct zone **zones,
inc_page_state(allocstall);
for (i = 0; zones[i] != 0; i++)
zones[i]->temp_priority = DEF_PRIORITY;
for (i = 0; zones[i] != NULL; i++) {
struct zone *zone = zones[i];
zone->temp_priority = DEF_PRIORITY;
lru_pages += zone->nr_active + zone->nr_inactive;
}
for (priority = DEF_PRIORITY; priority >= 0; priority--) {
sc.nr_mapped = read_page_state(nr_mapped);
......@@ -912,7 +920,7 @@ int try_to_free_pages(struct zone **zones,
sc.nr_reclaimed = 0;
sc.priority = priority;
shrink_caches(zones, &sc);
shrink_slab(sc.nr_scanned, gfp_mask);
shrink_slab(sc.nr_scanned, gfp_mask, lru_pages);
if (reclaim_state) {
sc.nr_reclaimed += reclaim_state->reclaimed_slab;
reclaim_state->reclaimed_slab = 0;
......@@ -997,7 +1005,7 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages)
for (priority = DEF_PRIORITY; priority >= 0; priority--) {
int all_zones_ok = 1;
int end_zone = 0; /* Inclusive. 0 = ZONE_DMA */
unsigned long lru_pages = 0;
if (nr_pages == 0) {
/*
......@@ -1021,6 +1029,12 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages)
end_zone = pgdat->nr_zones - 1;
}
scan:
for (i = 0; i <= end_zone; i++) {
struct zone *zone = pgdat->node_zones + i;
lru_pages += zone->nr_active + zone->nr_inactive;
}
/*
* Now scan the zone in the dma->highmem direction, stopping
* at the last zone which needs scanning.
......@@ -1048,7 +1062,7 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages)
sc.priority = priority;
shrink_zone(zone, &sc);
reclaim_state->reclaimed_slab = 0;
shrink_slab(sc.nr_scanned, GFP_KERNEL);
shrink_slab(sc.nr_scanned, GFP_KERNEL, lru_pages);
sc.nr_reclaimed += reclaim_state->reclaimed_slab;
total_reclaimed += sc.nr_reclaimed;
if (zone->all_unreclaimable)
......
scripts/Makefile
View file @ 62401684
......@@ -5,24 +5,11 @@
# docproc: Preprocess .tmpl file in order to generate .sgml docs
# conmakehash: Create arrays for initializing the kernel console tables
host-progs := conmakehash kallsyms modpost mk_elfconfig pnmtologo bin2c
always := $(host-progs) empty.o
modpost-objs := modpost.o file2alias.o sumversion.o
host-progs := conmakehash kallsyms pnmtologo bin2c
always := $(host-progs)
subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-y += mod
# Let clean descend into subdirs
subdir- += basic lxdialog kconfig package
# dependencies on generated files need to be listed explicitly
$(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h
quiet_cmd_elfconfig = MKELF $@
cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
$(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
$(call if_changed,elfconfig)
targets += elfconfig.h
scripts/Makefile.modpost
View file @ 62401684
......@@ -50,7 +50,7 @@ _modpost: $(modules)
# Step 2), invoke modpost
# Includes step 3,4
quiet_cmd_modpost = MODPOST
cmd_modpost = scripts/modpost \
cmd_modpost = scripts/mod/modpost \
$(if $(KBUILD_EXTMOD),-i,-o) $(symverfile) \
$(filter-out FORCE,$^)
......
scripts/genksyms/parse.c_shipped
View file @ 62401684
......@@ -156,7 +156,7 @@ static const short yyrhs[] = { 53,
71, 94, 92, 82, 0, 0, 62, 0, 63, 0,
62, 63, 0, 64, 0, 65, 0, 5, 0, 16,
0, 20, 0, 11, 0, 13, 0, 66, 0, 70,
0, 27, 46, 65, 47, 0, 21, 36, 0, 23,
0, 27, 46, 62, 47, 0, 21, 36, 0, 23,
36, 0, 10, 36, 0, 21, 36, 84, 0, 23,
36, 84, 0, 10, 36, 31, 0, 10, 31, 0,
21, 84, 0, 23, 84, 0, 7, 0, 18, 0,
......@@ -291,142 +291,150 @@ static const short yydefgoto[] = { 1,
};
static const short yypact[] = {-32768,
19,-32768, 175,-32768, 32,-32768,-32768,-32768,-32768,-32768,
15,-32768, 197,-32768, 23,-32768,-32768,-32768,-32768,-32768,
-18,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768, -30,-32768, -26,-32768,-32768,-32768, -32, -10, -2,
-32768,-32768,-32768,-32768, 2, 428,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768, 34, 12, 79,
-32768, 428, 12,-32768, 455, 33,-32768,-32768, 15, 14,
35, 29,-32768, 2, -14, -21,-32768,-32768,-32768, 67,
31, 37, 127,-32768,-32768, 2,-32768, 54, 60, 66,
69,-32768, 14,-32768,-32768, 2,-32768,-32768,-32768, 84,
-32768, 219,-32768,-32768, 70,-32768, 20, 91, 72, 84,
-20, 74, 81,-32768,-32768,-32768, 86,-32768, 102,-32768,
106,-32768,-32768,-32768,-32768,-32768, 109, 108, 348, 112,
126, 117,-32768,-32768, 118,-32768, 122,-32768,-32768,-32768,
-32768, 262,-32768, 31,-32768, 131,-32768,-32768,-32768,-32768,
-32768, 7, 120,-32768, -9,-32768,-32768, 392,-32768,-32768,
125, 130,-32768,-32768, 132,-32768, 159,-32768,-32768, 305,
-32768,-32768,-32768,-32768,-32768,-32768, 160, 161,-32768,-32768,
174,-32768
-32768, -28,-32768, -25,-32768,-32768,-32768, -26, -22, -12,
-32768,-32768,-32768,-32768, 49, 493,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768, 27, -8, 101,
-32768, 493, -8,-32768, 493, 10,-32768,-32768, 11, 9,
18, 26,-32768, 49, -15, -13,-32768,-32768,-32768, 25,
24, 48, 149,-32768,-32768, 49,-32768, 414, 39, 40,
47,-32768, 9,-32768,-32768, 49,-32768,-32768,-32768, 66,
-32768, 241,-32768,-32768, 50,-32768, 5, 65, 42, 66,
17, 56, 55,-32768,-32768,-32768, 60,-32768, 75,-32768,
80,-32768,-32768,-32768,-32768,-32768, 81, 82, 370, 85,
98, 89,-32768,-32768, 88,-32768, 91,-32768,-32768,-32768,
-32768, 284,-32768, 24,-32768, 103,-32768,-32768,-32768,-32768,
-32768, 8, 43,-32768, 30,-32768,-32768, 457,-32768,-32768,
92, 93,-32768,-32768, 95,-32768, 96,-32768,-32768, 327,
-32768,-32768,-32768,-32768,-32768,-32768, 99, 104,-32768,-32768,
148,-32768
};
static const short yypgoto[] = {-32768,
208,-32768,-32768,-32768, 158,-32768,-32768, 128, 0, -90,
-36,-32768, 157,-32768, -70,-32768,-32768, -51, -31,-32768,
-40,-32768, -125,-32768,-32768, 65, -97,-32768,-32768,-32768,
-32768, -19,-32768,-32768, 143,-32768,-32768, 83, 124, 141,
152,-32768,-32768,-32768, 119,-32768,-32768, 94, 0, -55,
-35,-32768,-32768,-32768, -69,-32768,-32768, -56, -30,-32768,
-76,-32768, -122,-32768,-32768, 29, -62,-32768,-32768,-32768,
-32768, -17,-32768,-32768, 105,-32768,-32768, 52, 86, 83,
-32768,-32768,-32768
};
#define YYLAST 495
static const short yytable[] = { 67,
99, 119, 35, 65, 54, 49, 152, 155, 84, 53,
91, 131, 47, 55, 88, 80, 89, 48, 171, 50,
125, 9, 159, 50, 92, 132, 99, 81, 99, 69,
18, 114, 87, 77, 168, 56, 160, 58, -89, 27,
57, 119, 140, 31, 157, 158, 156, 59, 143, 60,
58, 76, 142, -89, 60, 126, 127, 119, 129, 96,
59, 50, 60, 99, 68, 97, 95, 60, 79, 119,
96, 143, 143, 86, 45, 46, 97, 85, 60, 70,
106, 98, 67, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
110, 24, 25, 26, 27, 28, 111, 126, 31, 93,
94, 96, 112, 116, -19, 113, 133, 97, 32, 60,
98, -19, -103, 128, -19, 134, -19, 107, 93, -19,
88, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 135, 24,
25, 26, 27, 28, 139, 140, 31, 136, 146, 156,
147, 148, -19, 154, 149, 142, 32, 60, 150, -19,
-104, 163, -19, 172, -19, 5, 164, -19, 165, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 166, 169, 170, 4, 75,
-19, 78, 162, 115, 32, 108, 153, -19, 124, 118,
-19, 0, -19, 6, 7, 8, 9, 10, 11, 12,
#define YYLAST 533
static const short yytable[] = { 78,
67, 99, 35, 84, 65, 125, 54, 49, 155, 152,
53, 80, 47, 88, 171, 89, 9, 48, 91, 55,
127, 50, 129, 56, 50, 18, 114, 99, 81, 99,
57, 69, 92, 87, 27, 77, 119, 168, 31, -89,
126, 50, 67, 140, 96, 79, 58, 156, 131, 143,
97, 76, 60, 142, -89, 60, 59, 68, 60, 95,
85, 159, 132, 96, 99, 45, 46, 93, 94, 97,
86, 60, 143, 143, 98, 160, 119, 126, 140, 157,
158, 96, 156, 67, 58, 111, 112, 97, 142, 60,
60, 106, 119, 113, 59, 116, 60, 128, 133, 134,
98, 70, 93, 88, 119, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 135, 24, 25, 26, 27, 28, 139, 136,
31, 146, 147, 148, 149, 154, -19, 150, 163, 164,
32, 165, 166, -19, -103, 169, -19, 172, -19, 107,
170, -19, 4, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
130, 24, 25, 26, 27, 28, 0, 0, 31, 0,
0, 0, 0, -82, 0, 0, 0, 0, 32, 0,
0, 0, 151, 0, 0, -82, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 0, 24, 25, 26, 27, 28, 0,
0, 31, 0, 0, 0, 0, -82, 0, 0, 0,
0, 32, 0, 0, 0, 167, 0, 0, -82, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 0, 24, 25, 26,
27, 28, 0, 0, 31, 0, 0, 0, 0, -82,
0, 0, 0, 0, 32, 0, 0, 0, 0, 0,
0, -82, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 0,
24, 25, 26, 27, 28, 0, 0, 31, 0, 0,
0, 0, 0, 140, 0, 0, 0, 141, 0, 0,
0, 0, 0, 142, 0, 60, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 0, 24, 25, 26, 27, 28, 0,
0, 31, 0, 0, 0, 0, 161, 0, 0, 0,
0, 32, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 0,
24, 25, 26, 27, 28, 0, 0, 31, 0, 0,
7, 8, 9, 10, 11, 0, 13, 32, 15, 16,
0, 18, 19, 20, 0, 22, 0, 24, 25, 26,
27, 28, 0, 0, 31, 0, 0, 0, 0, 0,
0, 0, 0, 0, 32
75, 24, 25, 26, 27, 28, 162, 108, 31, 115,
124, 0, 130, 0, -19, 153, 0, 0, 32, 0,
0, -19, -104, 0, -19, 0, -19, 5, 0, -19,
0, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 0, 0, 0,
0, 0, -19, 0, 0, 0, 32, 0, 0, -19,
0, 118, -19, 0, -19, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 0, 24, 25, 26, 27, 28, 0, 0,
31, 0, 0, 0, 0, -82, 0, 0, 0, 0,
32, 0, 0, 0, 151, 0, 0, -82, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 0, 24, 25, 26, 27,
28, 0, 0, 31, 0, 0, 0, 0, -82, 0,
0, 0, 0, 32, 0, 0, 0, 167, 0, 0,
-82, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 0, 24,
25, 26, 27, 28, 0, 0, 31, 0, 0, 0,
0, -82, 0, 0, 0, 0, 32, 0, 0, 0,
0, 0, 0, -82, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 0, 24, 25, 26, 27, 28, 0, 0, 31,
0, 0, 0, 0, 0, 140, 0, 0, 0, 141,
0, 0, 0, 0, 0, 142, 0, 60, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 0, 24, 25, 26, 27,
28, 0, 0, 31, 0, 0, 0, 0, 0, 0,
0, 0, 0, 32, 0, 0, 0, 0, 0, 0,
110, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 0, 24,
25, 26, 27, 28, 0, 0, 31, 0, 0, 0,
0, 161, 0, 0, 0, 0, 32, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 0, 24, 25, 26, 27, 28,
0, 0, 31, 0, 0, 0, 0, 0, 0, 0,
0, 0, 32
};
static const short yycheck[] = { 36,
71, 92, 3, 35, 24, 36, 132, 1, 60, 36,
32, 32, 31, 46, 29, 1, 31, 36, 0, 50,
1, 8, 32, 50, 46, 46, 97, 59, 99, 49,
17, 83, 64, 53, 160, 46, 46, 36, 32, 26,
43, 132, 36, 30, 142, 143, 40, 46, 119, 48,
36, 52, 46, 47, 48, 36, 97, 148, 99, 40,
46, 50, 48, 134, 31, 46, 36, 48, 36, 160,
40, 142, 143, 45, 43, 44, 46, 43, 48, 1,
44, 51, 119, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
47, 23, 24, 25, 26, 27, 47, 36, 30, 43,
44, 40, 47, 30, 36, 47, 43, 46, 40, 48,
51, 43, 44, 33, 46, 45, 48, 1, 43, 51,
29, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 43, 23,
24, 25, 26, 27, 47, 36, 30, 49, 47, 40,
35, 45, 36, 33, 47, 46, 40, 48, 47, 43,
44, 47, 46, 0, 48, 1, 47, 51, 47, 5,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 47, 47, 47, 1, 52,
36, 55, 148, 86, 40, 73, 134, 43, 95, 1,
46, -1, 48, 5, 6, 7, 8, 9, 10, 11,
static const short yycheck[] = { 55,
36, 71, 3, 60, 35, 1, 24, 36, 1, 132,
36, 1, 31, 29, 0, 31, 8, 36, 32, 46,
97, 50, 99, 46, 50, 17, 83, 97, 59, 99,
43, 49, 46, 64, 26, 53, 92, 160, 30, 32,
36, 50, 78, 36, 40, 36, 36, 40, 32, 119,
46, 52, 48, 46, 47, 48, 46, 31, 48, 36,
43, 32, 46, 40, 134, 43, 44, 43, 44, 46,
45, 48, 142, 143, 51, 46, 132, 36, 36, 142,
143, 40, 40, 119, 36, 47, 47, 46, 46, 48,
48, 44, 148, 47, 46, 30, 48, 33, 43, 45,
51, 1, 43, 29, 160, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 43, 23, 24, 25, 26, 27, 47, 49,
30, 47, 35, 45, 47, 33, 36, 47, 47, 47,
40, 47, 47, 43, 44, 47, 46, 0, 48, 1,
47, 51, 1, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
100, 23, 24, 25, 26, 27, -1, -1, 30, -1,
-1, -1, -1, 35, -1, -1, -1, -1, 40, -1,
-1, -1, 1, -1, -1, 47, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, -1, 23, 24, 25, 26, 27, -1,
-1, 30, -1, -1, -1, -1, 35, -1, -1, -1,
-1, 40, -1, -1, -1, 1, -1, -1, 47, 5,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, -1, 23, 24, 25,
26, 27, -1, -1, 30, -1, -1, -1, -1, 35,
-1, -1, -1, -1, 40, -1, -1, -1, -1, -1,
-1, 47, 5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, -1,
23, 24, 25, 26, 27, -1, -1, 30, -1, -1,
-1, -1, -1, 36, -1, -1, -1, 40, -1, -1,
-1, -1, -1, 46, -1, 48, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, -1, 23, 24, 25, 26, 27, -1,
-1, 30, -1, -1, -1, -1, 35, -1, -1, -1,
-1, 40, 5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, -1,
23, 24, 25, 26, 27, -1, -1, 30, -1, -1,
6, 7, 8, 9, 10, -1, 12, 40, 14, 15,
-1, 17, 18, 19, -1, 21, -1, 23, 24, 25,
26, 27, -1, -1, 30, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 40
52, 23, 24, 25, 26, 27, 148, 73, 30, 86,
95, -1, 100, -1, 36, 134, -1, -1, 40, -1,
-1, 43, 44, -1, 46, -1, 48, 1, -1, 51,
-1, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, -1, -1, -1,
-1, -1, 36, -1, -1, -1, 40, -1, -1, 43,
-1, 1, 46, -1, 48, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, -1, 23, 24, 25, 26, 27, -1, -1,
30, -1, -1, -1, -1, 35, -1, -1, -1, -1,
40, -1, -1, -1, 1, -1, -1, 47, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, -1, 23, 24, 25, 26,
27, -1, -1, 30, -1, -1, -1, -1, 35, -1,
-1, -1, -1, 40, -1, -1, -1, 1, -1, -1,
47, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, -1, 23,
24, 25, 26, 27, -1, -1, 30, -1, -1, -1,
-1, 35, -1, -1, -1, -1, 40, -1, -1, -1,
-1, -1, -1, 47, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, -1, 23, 24, 25, 26, 27, -1, -1, 30,
-1, -1, -1, -1, -1, 36, -1, -1, -1, 40,
-1, -1, -1, -1, -1, 46, -1, 48, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, -1, 23, 24, 25, 26,
27, -1, -1, 30, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 40, -1, -1, -1, -1, -1, -1,
47, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, -1, 23,
24, 25, 26, 27, -1, -1, 30, -1, -1, -1,
-1, 35, -1, -1, -1, -1, 40, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, -1, 23, 24, 25, 26, 27,
-1, -1, 30, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 40
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
......
scripts/mkmakefile 0 → 100644
View file @ 62401684
#!/bin/sh
# Generates a small Makefile used in the root of the output
# directory, to allow make to be started from there.
# The Makefile also allow for more convinient build of external modules
# Usage
# $1 - Kernel src directory
# $2 - Output directory
# $3 - version
# $4 - patchlevel
cat << EOF
# Automatically generated by $0: don't edit
VERSION = $3
PATCHLEVEL = $4
KERNELSRC := $1
KERNELOUTPUT := $2
MAKEFLAGS += --no-print-directory
all:
\$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT)
%::
\$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
EOF
scripts/mod/Makefile 0 → 100644
View file @ 62401684
host-progs := modpost mk_elfconfig
always := $(host-progs) empty.o
modpost-objs := modpost.o file2alias.o sumversion.o
# dependencies on generated files need to be listed explicitly
$(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h
quiet_cmd_elfconfig = MKELF $@
cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
$(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
$(call if_changed,elfconfig)
targets += elfconfig.h
scripts/file2alias.c → scripts/mod/file2alias.c
View file @ 62401684
......@@ -27,7 +27,7 @@ typedef unsigned char __u8;
/* Big exception to the "don't include kernel headers into userspace, which
* even potentially has different endianness and word sizes, since
* we handle those differences explicitly below */
#include "../include/linux/mod_devicetable.h"
#include "../../include/linux/mod_devicetable.h"
#define ADD(str, sep, cond, field) \
do { \
......
scripts/package/Makefile
View file @ 62401684
......@@ -31,9 +31,10 @@ KERNELPATH := kernel-$(subst -,,$(KERNELRELEASE))
MKSPEC := $(srctree)/scripts/package/mkspec
PREV := set -e; cd ..;
# rpm-pkg
.PHONY: rpm-pkg rpm
$(objtree)/kernel.spec: $(MKSPEC)
$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
$(CONFIG_SHELL) $(MKSPEC) > $@
rpm-pkg rpm: $(objtree)/kernel.spec
......@@ -52,6 +53,22 @@ rpm-pkg rpm: $(objtree)/kernel.spec
clean-rule += rm -f $(objtree)/kernel.spec
# binrpm-pkg
.PHONY: binrpm-pkg
$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
$(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
binrpm-pkg: $(objtree)/binkernel.spec
$(MAKE)
set -e; \
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
set -e; \
mv -f $(objtree)/.tmp_version $(objtree)/.version
$(RPM) --define "_builddir $(srctree)" --target $(UTS_MACHINE) -bb $<
clean-rule += rm -f $(objtree)/binkernel.spec
# Deb target
# ---------------------------------------------------------------------------
#
......@@ -67,5 +84,6 @@ clean-rule += && rm -rf $(objtree)/debian/
# ---------------------------------------------------------------------------
help:
@echo ' rpm-pkg - Build the kernel as an RPM package'
@echo ' binrpm-pkg - Build an rpm package containing the compiled kernel & modules'
@echo ' deb-pkg - Build the kernel as an deb package'
scripts/package/mkspec
View file @ 62401684
......@@ -9,6 +9,13 @@
# Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
#
# how we were called determines which rpms we build and how we build them
if [ "$1" = "prebuilt" ]; then
PREBUILT=true
else
PREBUILT=false
fi
# starting to output the spec
if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
PROVIDES=kernel-drm
......@@ -26,8 +33,12 @@ echo "License: GPL"
echo "Group: System Environment/Kernel"
echo "Vendor: The Linux Community"
echo "URL: http://www.kernel.org"
if ! $PREBUILT; then
echo -n "Source: kernel-$VERSION.$PATCHLEVEL.$SUBLEVEL"
echo "$EXTRAVERSION.tar.gz" | sed -e "s/-//g"
fi
echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root"
echo "Provides: $PROVIDES"
echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :"
......@@ -36,12 +47,20 @@ echo ""
echo "%description"
echo "The Linux Kernel, the operating system core itself"
echo ""
if ! $PREBUILT; then
echo "%prep"
echo "%setup -q"
echo ""
fi
echo "%build"
if ! $PREBUILT; then
echo "make clean && make"
echo ""
fi
echo "%install"
echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7