2.6.1

diff -Nru a/Makefile b/Makefile
--- a/Makefile   Thu Jan  8 23:00:24 2004
+++ b/Makefile   Thu Jan  8 23:00:24 2004
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 0
+SUBLEVEL = 1
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -275,7 +275,7 @@
 CPPFLAGS        := -D__KERNEL__ -Iinclude \
          $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include)
 
-CFLAGS       := -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
+CFLAGS       := -Wall -Wstrict-prototypes -Wno-trigraphs \
            -fno-strict-aliasing -fno-common
 AFLAGS      := -D__ASSEMBLY__
 
@@ -431,6 +431,12 @@
 # ---------------------------------------------------------------------------
 
 
+ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+CFLAGS      += -Os
+else
+CFLAGS      += -O2
+endif
+
 ifndef CONFIG_FRAME_POINTER
 CFLAGS      += -fomit-frame-pointer
 endif
@@ -872,7 +878,7 @@
    $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\
    mv -f $(objtree)/.tmp_version $(objtree)/.version;
 
-   $(RPM) -ta ../$(KERNELPATH).tar.gz
+   $(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
    rm ../$(KERNELPATH).tar.gz
 
 # Brief documentation of the typical targets used