From 38c149f3f3fa1bd06bccd369f767cbcff9003a70 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Nov 2008 21:12:17 -0800 Subject: [PATCH] --- yaml --- r: 118599 b: refs/heads/master c: 0c4b95455f250c7006af00208aefdf0f93f63144 h: refs/heads/master i: 118597: 0231a383dcd4f03a42920fc3d3be9d7f3229f85d 118595: 0790063dfac81361349460bd4edf38b59a7f3ae3 118591: 261e0d05460d3f1dfa0465b4d2ae75a41546db8b v: v3 --- [refs] | 2 +- trunk/drivers/staging/Kconfig | 20 ++++++++++++++++++-- trunk/include/asm-generic/memory_model.h | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 92c3a3ed8f4d..dca34fd43db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5d712433ff57a66d8fb79a57a4fc7a7c3467b97 +refs/heads/master: 0c4b95455f250c7006af00208aefdf0f93f63144 diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index e1654f59eb70..0a49cd788a75 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/drivers/staging/Kconfig @@ -21,7 +21,23 @@ menuconfig STAGING If in doubt, say N here. -if STAGING + +config STAGING_EXCLUDE_BUILD + bool "Exclude Staging drivers from being built" + default y + ---help--- + Are you sure you really want to build the staging drivers? + They taint your kernel, don't live up to the normal Linux + kernel quality standards, are a bit crufty around the edges, + and might go off and kick your dog when you aren't paying + attention. + + Say N here to be able to select and build the Staging drivers. + This option is primarily here to prevent them from being built + when selecting 'make allyesconfg' and 'make allmodconfig' so + don't be all that put off, your dog will be just fine. + +if !STAGING_EXCLUDE_BUILD source "drivers/staging/et131x/Kconfig" @@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig" source "drivers/staging/poch/Kconfig" -endif # STAGING +endif # !STAGING_EXCLUDE_BUILD diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h index 18546d8eb78e..ae060c62aff1 100644 --- a/trunk/include/asm-generic/memory_model.h +++ b/trunk/include/asm-generic/memory_model.h @@ -34,7 +34,7 @@ #define __pfn_to_page(pfn) \ ({ unsigned long __pfn = (pfn); \ - unsigned long __nid = arch_pfn_to_nid(__pfn); \ + unsigned long __nid = arch_pfn_to_nid(pfn); \ NODE_DATA(__nid)->node_mem_map + arch_local_page_offset(__pfn, __nid);\ })