2.6.11

diff -Nru a/Makefile b/Makefile
--- a/Makefile   2005-03-01 23:39:07 -08:00
+++ b/Makefile   2005-03-01 23:39:07 -08:00
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 10
+SUBLEVEL = 11
 EXTRAVERSION =
 NAME=Woozy Numbat
 
@@ -149,14 +149,13 @@
 # careful not to include files twice if building in the source
 # directory. LOCALVERSION from the command line override all of this
 
-ifeq ($(objtree),$(srctree))
-localversion-files := $(wildcard $(srctree)/localversion*)
-else
-localversion-files := $(wildcard $(objtree)/localversion* $(srctree)/localversion*)
-endif
+localver := $(objtree)/localversion* $(srctree)/localversion*
+localver := $(sort $(wildcard $(localver)))
+# skip backup files (containing '~')
+localver := $(foreach f, $(localver), $(if $(findstring ~, $(f)),,$(f)))
 
 LOCALVERSION = $(subst $(space),, \
-          $(shell cat /dev/null $(localversion-files:%~=)) \
+          $(shell cat /dev/null $(localver)) \
           $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
@@ -291,7 +290,7 @@
             $(call cc-option, $(1),$(2))
 
 # cc-option-yn
-# Usage: flag := $(call gcc-option-yn, -march=winchip-c6)
+# Usage: flag := $(call cc-option-yn, -march=winchip-c6)
 cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
                 > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
 
@@ -331,7 +330,10 @@
 KALLSYMS   = scripts/kallsyms
 PERL      = perl
 CHECK      = sparse
+
+NOSTDINC_FLAGS  = -nostdinc -isystem $(shell $(CC) -print-file-name=include)
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__
+CHECKFLAGS     += $(NOSTDINC_FLAGS)
 MODFLAGS   = -DMODULE
 CFLAGS_MODULE   = $(MODFLAGS)
 AFLAGS_MODULE   = $(MODFLAGS)
@@ -339,7 +341,6 @@
 CFLAGS_KERNEL   =
 AFLAGS_KERNEL   =
 
-NOSTDINC_FLAGS  = -nostdinc -iwithprefix include
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
@@ -349,7 +350,8 @@
 CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 
 CFLAGS       := -Wall -Wstrict-prototypes -Wno-trigraphs \
-           -fno-strict-aliasing -fno-common
+           -fno-strict-aliasing -fno-common \
+         -ffreestanding
 AFLAGS      := -D__ASSEMBLY__
 
 export   VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION LOCALVERSION KERNELRELEASE \
@@ -389,7 +391,7 @@
 # using a seperate output directory. This allows convinient use
 # of make in output directory
 outputmakefile:
-   $(Q)if /usr/bin/env test ! $(srctree) -ef $(objtree); then \
+   $(Q)if test ! $(srctree) -ef $(objtree); then \
    $(CONFIG_SHELL) $(srctree)/scripts/mkmakefile              \
        $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)         \
        > $(objtree)/Makefile;                                 \
@@ -531,6 +533,9 @@
 # warn about C99 declaration after statement
 CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
 
+# disable pointer signedness warnings in gcc 4.0
+CFLAGS += $(call cc-option,-Wno-pointer-sign,)
+
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the commandline or
 # set in the environment
@@ -1166,7 +1171,7 @@
 quiet_cmd_tags = MAKE   $@
 define cmd_tags
    rm -f $@; \
-   CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`+
; \
+   CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL"`; \
    $(all-sources) | xargs ctags $$CTAGSF -a
 endef
 
@@ -1209,6 +1214,9 @@
 checkstack:
    $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
    $(PERL) $(src)/scripts/checkstack.pl $(ARCH)
+
+kernelrelease:
+   @echo $(KERNELRELEASE)
 
 # FIXME Should go into a make.lib or something 
 # ===========================================================================