---

yaml
---
r: 178107
b: refs/heads/master
c: 2fbe74b
h: refs/heads/master
i:
  178105: 06d3ecd
  178103: 3b46fb4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c3b9b50db5fe8d6039dfdfc44202fcd49eb9d00
+refs/heads/master: 2fbe74b90bafebce615466b4c20f96b0465df1ae

trunk/.gitignore

@@ -22,7 +22,6 @@
 *.lst
 *.symtypes
 *.order
-modules.builtin
 *.elf
 *.bin
 *.gz
@@ -46,8 +45,14 @@ Module.symvers
 #
 # Generated include files
 #
+include/asm
+include/asm-*/asm-offsets.h
 include/config
+include/linux/autoconf.h
+include/linux/compile.h
 include/linux/version.h
+include/linux/utsrelease.h
+include/linux/bounds.h
 include/generated
 
 # stgit generated dirs

trunk/Documentation/cpu-hotplug.txt

@@ -315,26 +315,41 @@ A: The following are what is required for CPU hotplug infrastructure to work
 
 Q: I need to ensure that a particular cpu is not removed when there is some
    work specific to this cpu is in progress.
-A: There are two ways.  If your code can be run in interrupt context, use
-   smp_call_function_single(), otherwise use work_on_cpu().  Note that
-   work_on_cpu() is slow, and can fail due to out of memory:
+A: First switch the current thread context to preferred cpu
 
 	int my_func_on_cpu(int cpu)
 	{
-		int err;
-		get_online_cpus();
-		if (!cpu_online(cpu))
-			err = -EINVAL;
-		else
-#if NEEDS_BLOCKING
-			err = work_on_cpu(cpu, __my_func_on_cpu, NULL);
-#else
-			smp_call_function_single(cpu, __my_func_on_cpu, &err,
-						 true);
-#endif
-		put_online_cpus();
-		return err;
-	}
+		cpumask_t saved_mask, new_mask = CPU_MASK_NONE;
+		int curr_cpu, err = 0;
+
+		saved_mask = current->cpus_allowed;
+		cpu_set(cpu, new_mask);
+		err = set_cpus_allowed(current, new_mask);
+
+		if (err)
+			return err;
+
+		/*
+		 * If we got scheduled out just after the return from
+		 * set_cpus_allowed() before running the work, this ensures
+		 * we stay locked.
+		 */
+		curr_cpu = get_cpu();
+
+		if (curr_cpu != cpu) {
+			err = -EAGAIN;
+			goto ret;
+		} else {
+			/*
+			 * Do work : But cant sleep, since get_cpu() disables preempt
+			 */
+		}
+		ret:
+			put_cpu();
+			set_cpus_allowed(current, saved_mask);
+			return err;
+		}
+
 
 Q: How do we determine how many CPUs are available for hotplug.
 A: There is no clear spec defined way from ACPI that can give us that

trunk/Documentation/dontdiff

@@ -103,7 +103,6 @@ gconf
 gen-devlist
 gen_crc32table
 gen_init_cpio
-generated
 genheaders
 genksyms
 *_gray256.c

trunk/Documentation/kbuild/kbuild.txt

@@ -1,17 +1,3 @@
-Output files
-
-modules.order
---------------------------------------------------
-This file records the order in which modules appear in Makefiles. This
-is used by modprobe to deterministically resolve aliases that match
-multiple modules.
-
-modules.builtin
---------------------------------------------------
-This file lists all modules that are built into the kernel. This is used
-by modprobe to not fail when trying to load something builtin.
-
-
 Environment variables
 
 KCPPFLAGS

trunk/Documentation/kbuild/kconfig.txt

@@ -103,16 +103,10 @@ KCONFIG_AUTOCONFIG
 This environment variable can be set to specify the path & name of the
 "auto.conf" file.  Its default value is "include/config/auto.conf".
 
-KCONFIG_TRISTATE
---------------------------------------------------
-This environment variable can be set to specify the path & name of the
-"tristate.conf" file.  Its default value is "include/config/tristate.conf".
-
 KCONFIG_AUTOHEADER
 --------------------------------------------------
 This environment variable can be set to specify the path & name of the
-"autoconf.h" (header) file.
-Its default value is "include/generated/autoconf.h".
+"autoconf.h" (header) file.  Its default value is "include/linux/autoconf.h".
 
 
 ======================================================================

trunk/Kbuild

@@ -8,7 +8,7 @@
 #####
 # 1) Generate bounds.h
 
-bounds-file := include/generated/bounds.h
+bounds-file := include/linux/bounds.h
 
 always  := $(bounds-file)
 targets := $(bounds-file) kernel/bounds.s
@@ -43,7 +43,7 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild
 # 2) Generate asm-offsets.h
 #
 
-offsets-file := include/generated/asm-offsets.h
+offsets-file := include/asm/asm-offsets.h
 
 always  += $(offsets-file)
 targets += $(offsets-file)

trunk/MAINTAINERS

@@ -5434,12 +5434,6 @@ F:	drivers/uwb/*
 F:	include/linux/uwb.h
 F:	include/linux/uwb/
 
-UNIFDEF
-M:	Tony Finch <dot@dotat.at>
-W:	http://dotat.at/prog/unifdef
-S:	Maintained
-F:	scripts/unifdef.c
-
 UNIFORM CDROM DRIVER
 M:	Jens Axboe <axboe@kernel.dk>
 W:	http://www.kernel.dk