---

yaml
---
r: 144893
b: refs/heads/master
c: f29ce72
h: refs/heads/master
i:
  144891: 571d13a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f181328287db30671e9997329cff71395d4af8b
+refs/heads/master: f29ce72795bf335553ab972606bc576b5473995e

trunk/Documentation/sysfs-rules.txt

@@ -113,7 +113,7 @@ versions of the sysfs interface.
   "devices" directory at /sys/subsystem/<name>/devices.
 
   If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be
-  ignored. If it does not exist, you always have to scan all three
+  ignored. If it does not exist, you have always to scan all three
   places, as the kernel is free to move a subsystem from one place to
   the other, as long as the devices are still reachable by the same
   subsystem name.

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 30
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc4
 NAME = Vindictive Armadillo
 
 # *DOCUMENTATION*

trunk/arch/alpha/include/asm/percpu.h

@@ -1,9 +1,7 @@
 #ifndef __ALPHA_PERCPU_H
 #define __ALPHA_PERCPU_H
-
 #include <linux/compiler.h>
 #include <linux/threads.h>
-#include <linux/percpu-defs.h>
 
 /*
  * Determine the real variable name from the name visible in the
@@ -75,28 +73,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
 
 #endif /* SMP */
 
-#ifdef CONFIG_SMP
-#define PER_CPU_BASE_SECTION ".data.percpu"
-#else
-#define PER_CPU_BASE_SECTION ".data"
-#endif
-
-#ifdef CONFIG_SMP
-
-#ifdef MODULE
-#define PER_CPU_SHARED_ALIGNED_SECTION ""
-#else
-#define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned"
-#endif
-#define PER_CPU_FIRST_SECTION ".first"
-
-#else
-
-#define PER_CPU_SHARED_ALIGNED_SECTION ""
-#define PER_CPU_FIRST_SECTION ""
-
-#endif
-
-#define PER_CPU_ATTRIBUTES
+#include <asm-generic/percpu.h>
 
 #endif /* __ALPHA_PERCPU_H */

trunk/arch/arm/mach-ixp4xx/ixp4xx_npe.c

@@ -714,7 +714,7 @@ static int __init npe_init_module(void)
 	}
 
 	if (!found)
-		return -ENODEV;
+		return -ENOSYS;
 	return 0;
 }
 

trunk/arch/cris/Makefile

@@ -70,7 +70,7 @@ SRC_ARCH              = $(srctree)/arch/cris
 # cris object files path
 OBJ_ARCH              = $(objtree)/arch/cris
 
-boot := arch/cris/boot
+boot := arch/cris/$(SARCH)/boot
 MACHINE := arch/cris/$(SARCH)
 
 all: zImage
@@ -81,15 +81,15 @@ zImage Image: vmlinux
 archprepare:
 
 archclean:
-	$(Q)if [ -e arch/cris/boot ]; then \
-		$(MAKE) $(clean)=arch/cris/boot; \
+	$(Q)if [ -e arch/cris/$(SARCH)/boot ]; then \
+		$(MAKE) $(clean)=arch/cris/$(SARCH)/boot; \
 	fi
 
 CLEAN_FILES += \
-	$(boot)/zImage \
-	$(boot)/compressed/decompress.bin \
-	$(boot)/compressed/piggy.gz \
-	$(boot)/rescue/rescue.bin
+	$(MACHINE)/boot/zImage \
+	$(MACHINE)/boot/compressed/decompress.bin \
+	$(MACHINE)/boot/compressed/piggy.gz \
+	$(MACHINE)/boot/rescue/rescue.bin
 
 
 # MRPROPER_FILES +=

trunk/arch/cris/boot/Makefile → trunk/arch/cris/arch-v10/boot/Makefile

@@ -1,12 +1,8 @@
 #
-# arch/cris/boot/Makefile
+# arch/cris/arch-v10/boot/Makefile
 #
 
-objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
-objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss
-
-OBJCOPYFLAGS = -O binary $(objcopyflags-y)
-
+OBJCOPYFLAGS = -O binary --remove-section=.bss
 
 subdir- := compressed rescue
 targets := Image

trunk/arch/cris/boot/compressed/Makefile → trunk/arch/cris/arch-v10/boot/compressed/Makefile

@@ -1,23 +1,11 @@
 #
-# arch/cris/boot/compressed/Makefile
+# arch/cris/arch-v10/boot/compressed/Makefile
 #
 
 asflags-y += $(LINUXINCLUDE)
 ccflags-y += -O2 $(LINUXINCLUDE)
-
-# asflags-$(CONFIG_ETRAX_ARCH_V32) += -I$(srctree)/include/asm/mach \
-# 				    -I$(srctree)/include/asm/arch
-# ccflags-$(CONFIG_ETRAX_ARCH_V32) += -O2 -I$(srctree)/include/asm/mach
-# 					-I$(srctree)/include/asm/arch
-
-arch-$(CONFIG_ETRAX_ARCH_V10) = v10
-arch-$(CONFIG_ETRAX_ARCH_V32) = v32
-
-ldflags-y += -T $(srctree)/$(src)/decompress_$(arch-y).lds
-
-OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
-OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
-OBJECTS= $(OBJECTS-y) $(obj)/misc.o
+ldflags-y += -T $(srctree)/$(src)/decompress.lds
+OBJECTS = $(obj)/head.o $(obj)/misc.o
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 
 quiet_cmd_image = BUILD   $@
@@ -36,3 +24,4 @@ $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
 
 $(obj)/piggy.gz: $(obj)/../Image FORCE
 	$(call if_changed,gzip)
+

trunk/arch/cris/arch-v10/boot/compressed/README

@@ -0,0 +1,25 @@
+Creation of the self-extracting compressed kernel image (vmlinuz)
+-----------------------------------------------------------------
+$Id: README,v 1.1 2001/12/17 13:59:27 bjornw Exp $
+
+This can be slightly confusing because it's a process with many steps.
+
+The kernel object built by the arch/etrax100/Makefile, vmlinux, is split
+by that makefile into text and data binary files, vmlinux.text and 
+vmlinux.data.
+
+Those files together with a ROM filesystem can be catted together and
+burned into a flash or executed directly at the DRAM origin.
+
+They can also be catted together and compressed with gzip, which is what
+happens in this makefile. Together they make up piggy.img. 
+
+The decompressor is built into the file decompress.o. It is turned into
+the binary file decompress.bin, which is catted together with piggy.img
+into the file vmlinuz. It can be executed in an arbitrary place in flash.
+
+Be careful - it assumes some things about free locations in DRAM. It
+assumes the DRAM starts at 0x40000000 and that it is at least 8 MB,
+so it puts its code at 0x40700000, and initial stack at 0x40800000.
+
+-Bjorn

trunk/arch/cris/boot/compressed/head_v10.S → trunk/arch/cris/arch-v10/boot/compressed/head.S

@@ -30,7 +30,7 @@
 	beq	dram_init_finished
 	nop
 
-#include "../../arch-v10/lib/dram_init.S"
+#include "../../lib/dram_init.S"
 
 dram_init_finished:
 
@@ -123,4 +123,4 @@ _cmd_line_magic:
 	.dword 0
 _cmd_line_addr:
 	.dword 0
-#include "../../arch-v10/lib/hw_settings.S"
+#include "../../lib/hw_settings.S"