* linux-next: manual merge of the moduleh tree with the sound tree
From: Stephen Rothwell @ 2011-09-28 7:03 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Liam Girdwood, Takashi Iwai
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
sound/soc/soc-io.c between commit be3ea3b9e8df ("ASoC: Use new register
map API for ASoC generic physical I/O") from the sound tree and commit
1aff9ab90466 ("sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where
needed") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
[Mark Brown <broonie@opensource.wolfsonmicro.com> was left off the cc list
because his host is not reolving in the DNS currently.]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/soc-io.c
index 66fcccd,963efe0..0000000
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@@ -13,7 -13,7 +13,8 @@@
#include <linux/i2c.h>
#include <linux/spi/spi.h>
+#include <linux/regmap.h>
+ #include <linux/export.h>
#include <sound/soc.h>
#include <trace/events/asoc.h>
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:10 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Benjamin Herrenschmidt
Hi Paul,
After merging the moduleh tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/tty/hvc/hvc_opal.c:244:12: error: 'THIS_MODULE' undeclared here (not in a function)
Caused by commit daea1175a9f0 ("powerpc/powernv: Support for OPAL
console") from the powerpc tree interacting with the module.h split up.
I have applied the below patch for today (and will carry it as a merge
fix up as necessary).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:07:24 +1000
Subject: [PATCH] powerpc/powernv: include export.h in hvc_opal.h for
THIS_MODULE
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tty/hvc/hvc_opal.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 7b38512..ced26c8 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -28,6 +28,7 @@
#include <linux/console.h>
#include <linux/of.h>
#include <linux/of_platform.h>
+#include <linux/export.h>
#include <asm/hvconsole.h>
#include <asm/prom.h>
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build warning after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:18 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jean Pihet, Rafael J. Wysocki
Hi Paul,
After merging the moduleh tree, today's linux-next build (powerepc
ppc64_defconfig) produced this warning:
drivers/base/power/qos.c:256:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:256:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:256:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:301:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:301:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:301:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:342:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:342:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:342:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:369:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:369:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:369:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:397:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:397:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:397:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:412:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:412:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:412:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:427:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:427:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:427:1: warning: parameter names (without types) in function declaration
Caused by commits 91ff4cb803df ("PM QoS: Implement per-device PM QoS
constraints") and b66213cdb002 ("PM QoS: Add global notification
mechanism for device constraints") from the pm tree interacting with the
module.h split up.
I added the following merge fixup patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:15:52 +1000
Subject: [PATCH] PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/power/qos.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index f9215e8..7f78682 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/device.h>
#include <linux/mutex.h>
+#include <linux/export.h>
static DEFINE_MUTEX(dev_pm_qos_mtx);
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next: build warning after merge of the moduleh tree
From: Pihet-XID, Jean @ 2011-09-28 7:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Gortmaker, linux-next, linux-kernel, Rafael J. Wysocki
In-Reply-To: <20110928171835.ba767809909ac049fc53bd40@canb.auug.org.au>
Hi Stephen,
On Wed, Sep 28, 2011 at 9:18 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (powerepc
> ppc64_defconfig) produced this warning:
>
> drivers/base/power/qos.c:256:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:256:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:256:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:301:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:301:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:301:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:342:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:342:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:342:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:369:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:369:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:369:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:397:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:397:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:397:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:412:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:412:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:412:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:427:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:427:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:427:1: warning: parameter names (without types) in function declaration
>
> Caused by commits 91ff4cb803df ("PM QoS: Implement per-device PM QoS
> constraints") and b66213cdb002 ("PM QoS: Add global notification
> mechanism for device constraints") from the pm tree interacting with the
> module.h split up.
>
> I added the following merge fixup patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 17:15:52 +1000
> Subject: [PATCH] PM QoS: include export.h in qos.c for EXPORT_SYMBOL
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thank you for fixing this. I am sorry the warning did not show up
during the OMAP and x86 builds, probably due to the different set of
includes for those platforms.
Regards,
Jean
> ---
> drivers/base/power/qos.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
> index f9215e8..7f78682 100644
> --- a/drivers/base/power/qos.c
> +++ b/drivers/base/power/qos.c
> @@ -39,6 +39,7 @@
> #include <linux/slab.h>
> #include <linux/device.h>
> #include <linux/mutex.h>
> +#include <linux/export.h>
>
>
> static DEFINE_MUTEX(dev_pm_qos_mtx);
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:42 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Borislav Petkov, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
penalties on AMD family 15h") from the tip tree interacting with the
module.h split up.
I applied the following patch (which could be applied to the tip
tree ...).
>From 6b1212311c0728a7e3054e1f187e7c3b9f464bd5 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:28:50 +1000
Subject: [PATCH] x86, amd: include linux/elf.h since we use stuff from
asm/elf.h
The lack of this inclusion causes build erros after the module.h split up:
arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/kernel/sys_x86_64.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index fe7d2da..0514890 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -14,6 +14,7 @@
#include <linux/personality.h>
#include <linux/random.h>
#include <linux/uaccess.h>
+#include <linux/elf.h>
#include <asm/ia32.h>
#include <asm/syscalls.h>
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:50 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Sam Bradshaw, Asai Thambi S P,
Jens Axboe
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: parameter names (without types) in function declaration
drivers/block/mtip32xx/mtip32xx.c:3589:15: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/block/mtip32xx/mtip32xx.c:3589:15: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3590:20: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/block/mtip32xx/mtip32xx.c:3590:20: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3591:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/block/mtip32xx/mtip32xx.c:3591:16: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3592:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: type defaults to 'int' in declaration of 'MODULE_VERSION'
drivers/block/mtip32xx/mtip32xx.c:3592:16: warning: function declaration isn't a prototype
Casued by commit 49fdf3a7c4cf ("block: Add driver for Micron RealSSD pcie
flash cards") from the block tree interacting with the module.h split up.
I applied the following patch for today (whcih should be applied to the
block tree ...).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:47:05 +1000
Subject: [PATCH] block/mtip32xx: include module.h for its utilities
The module.h split up produced thses errors/warnings:
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: parameter names (without types) in function declaration
drivers/block/mtip32xx/mtip32xx.c:3589:15: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/block/mtip32xx/mtip32xx.c:3589:15: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3590:20: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/block/mtip32xx/mtip32xx.c:3590:20: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3591:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/block/mtip32xx/mtip32xx.c:3591:16: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3592:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: type defaults to 'int' in declaration of 'MODULE_VERSION'
drivers/block/mtip32xx/mtip32xx.c:3592:16: warning: function declaration isn't a prototype
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/mtip32xx/mtip32xx.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 3ec3d34..0e19eb5 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -33,6 +33,7 @@
#include <linux/bio.h>
#include <linux/dma-mapping.h>
#include <linux/idr.h>
+#include <linux/module.h>
#include <../drivers/ata/ahci.h>
#include "mtip32xx.h"
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next: build failure after merge of the moduleh tree
From: Borislav Petkov @ 2011-09-28 7:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Gortmaker, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Petkov, Borislav, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
In-Reply-To: <20110928174214.17a58be15d84d67c185930e1@canb.auug.org.au>
On Wed, Sep 28, 2011 at 03:42:14AM -0400, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
> arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
> arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
> arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
> arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
> arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
> arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
> arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
>
> Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
> penalties on AMD family 15h") from the tip tree interacting with the
> module.h split up.
>
> I applied the following patch (which could be applied to the tip
> tree ...).
>
> From 6b1212311c0728a7e3054e1f187e7c3b9f464bd5 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 17:28:50 +1000
> Subject: [PATCH] x86, amd: include linux/elf.h since we use stuff from
> asm/elf.h
>
> The lack of this inclusion causes build erros after the module.h split up:
>
> arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
> arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
> arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
> arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
> arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
> arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
> arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
> arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/x86/kernel/sys_x86_64.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
> index fe7d2da..0514890 100644
> --- a/arch/x86/kernel/sys_x86_64.c
> +++ b/arch/x86/kernel/sys_x86_64.c
> @@ -14,6 +14,7 @@
> #include <linux/personality.h>
> #include <linux/random.h>
> #include <linux/uaccess.h>
> +#include <linux/elf.h>
>
> #include <asm/ia32.h>
> #include <asm/syscalls.h>
Yep, it looks good, thanks Stephen. Btw, this is the second time
something like that happens as a result from the module split tree,
here's the first one: http://marc.info/?l=linux-kernel&m=131296515915227
It's a good thing we have linux-next! :-)
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:00 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Ilan Elias, John W. Linville
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/nfc/nfcwilink.c:318:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/nfc/nfcwilink.c:340:15: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:340:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:340:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/nfc/nfcwilink.c:340:15: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:341:20: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:341:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:341:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/nfc/nfcwilink.c:341:20: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:342:16: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:342:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:342:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/nfc/nfcwilink.c:342:16: warning: function declaration isn't a prototype
Caused by commit 93aead46428d ("NFC: driver for TI shared transport")
from the wireless tree interacting with the module.h split up.
I applied the patch below for today (which should be applied to the
wireless tree).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:56:29 +1000
Subject: [PATCH] NFC: use of module facilities requires the inclusion of
module.h
Otherwise the module.h split up produces this build failure:
drivers/nfc/nfcwilink.c:318:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/nfc/nfcwilink.c:340:15: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:340:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:340:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/nfc/nfcwilink.c:340:15: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:341:20: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:341:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:341:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/nfc/nfcwilink.c:341:20: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:342:16: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:342:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:342:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/nfc/nfcwilink.c:342:16: warning: function declaration isn't a prototype
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/nfc/nfcwilink.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 5b0f1ff..06c3642 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -27,6 +27,7 @@
*
*/
#include <linux/platform_device.h>
+#include <linux/module.h>
#include <linux/nfc.h>
#include <net/nfc/nci.h>
#include <net/nfc/nci_core.h>
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:18 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Per Forlin, Chris Ball, Akinobu Mita
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant
Caused by commit b5a62f8be3af ("mmc: add module param to set fault
injection attributes") from the mmc tree interacting with the module.h
split up.
I have applied the patch below for today (something similar could be
applied to the mmc tree).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:09:12 +1000
Subject: [PATCH] mmc: using mopdule_param requires the inclusion of
moduleparam.h
Otherwise the module.h split up produces this error:
drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/mmc/core/debugfs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 0a1e7cf..f9e9ff0 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -9,6 +9,7 @@
*/
#include <linux/debugfs.h>
#include <linux/fs.h>
+#include <linux/moduleparam.h>
#include <linux/export.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:25 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Stefan Assmann, Larry Finger,
John W. Linville, David Miller, netdev
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant
Caused by commit b5be7e4c8f7b ("rtlwifi: add module parameter to set
global debug level") from the net tree interacting with the module.h
split up.
I have applied the following patch for today (and it could be applied to
the net or wireless trees).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:21:47 +1000
Subject: [PATCH] rtlwifi: use of module_param requires the inclusion of
moduleparam.h
Otherwise the module.h split up will fail like this:
drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/wireless/rtlwifi/debug.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index b2f897a..e69aba9 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -26,6 +26,8 @@
* Larry Finger <Larry.Finger@lwfinger.net>
*****************************************************************************/
+#include <linux/moduleparam.h>
+
#include "wifi.h"
static unsigned int debug = DBG_EMERG;
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:35 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Kalle Valo, Vasanthakumar Thiagarajan,
Raja Mani, Vivek Natarajan, Suraj Sumangala, Joe Perches,
Jouni Malinen, John W. Linville, David Miller, netdev
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the
net tree interacting with the module.h split up.
I have applied the following patch for today (which sould be applied to
the net or wireless trees).
>From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:32:34 +1000
Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion
of moduleparam.h
Otheriwse the module.h split up fails like this:
drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/wireless/ath/ath6kl/init.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 9d10322..8552da0 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <linux/moduleparam.h>
#include <linux/mmc/sdio_func.h>
#include "core.h"
#include "cfg80211.h"
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:41 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) went on producing more failures (beyond those reported
earlier). I have used the version of the moduleh tree from next-20110927
for today and will see if I have more stamina tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the slab tree
From: Stephen Rothwell @ 2011-09-28 9:01 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Vasiliy Kulikov, Pekka Enberg,
Christoph Lameter
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/slab.c
between commit ab067e99d22e ("mm: restrict access to slab files under
procfs and sysfs") from the slab tree and commit ea14c46ee4d9 ("mm:
restrict access to /proc/slabinfo") from the akpm tree.
The former is a superset of the latter, so I dropped that patch from the
akpm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
From: Jouni Malinen @ 2011-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
In-Reply-To: <20110928131917.fe58aa3efa5549a9b3a6e3da@canb.auug.org.au>
On Wed, Sep 28, 2011 at 01:19:17PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
> validation of AKM suites") from the wireless-current tree and commit
> 6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
> the wireless tree.
>
> The latter seems to make the former partly unneccessary, so I used that
> (see below).
The former was a semi-urgent bug fix which was the reason for pushing it
out more quickly. The latter does indeed remove half of the fix (the
wrong count used in the for loop), but the first part to validate
n_akm_suites is still needed. As long as you kept that from the former,
the latter one should indeed be used. These commits should apply cleanly
on top of each other when applied, but I'm not sure how that ends up
being handled for linux-next.
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the slab tree
From: Vasiliy Kulikov @ 2011-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Pekka Enberg,
Christoph Lameter
In-Reply-To: <20110928190158.d313ae65b9dcd0007fff0836@canb.auug.org.au>
On Wed, Sep 28, 2011 at 19:01 +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in mm/slab.c
> between commit ab067e99d22e ("mm: restrict access to slab files under
> procfs and sysfs") from the slab tree and commit ea14c46ee4d9 ("mm:
> restrict access to /proc/slabinfo") from the akpm tree.
>
> The former is a superset of the latter, so I dropped that patch from the
> akpm tree.
Oops, sorry, Andrew, I would send the patch with /sys/kernel/slab/ only
if I knew that you've picked the first patch (I didn't receive a tip).
Where does -mm tree lives now?
Thanks,
--
Vasiliy Kulikov
http://www.openwall.com - bringing security into open computing environments
^ permalink raw reply
* linux-next: build failure after merge of the akpm tree
From: Stephen Rothwell @ 2011-09-28 9:22 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Joe Perches, Benjamin Herrenschmidt,
Paul Mackerras, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1729 bytes --]
Hi Andrew,
After merging the akpm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from arch/powerpc/boot/stdio.c:12:0:
arch/powerpc/boot/stdio.h:10:17: error: expected declaration specifiers or '...' before numeric constant
arch/powerpc/boot/stdio.h:10:20: error: expected declaration specifiers or '...' before numeric constant
arch/powerpc/boot/stdio.h:10:8: warning: return type defaults to 'int'
arch/powerpc/boot/stdio.h:10:8: warning: function declaration isn't a prototype
arch/powerpc/boot/stdio.h: In function '__printf':
arch/powerpc/boot/stdio.h:14:17: error: expected declaration specifiers or '...' before numeric constant
arch/powerpc/boot/stdio.h:14:20: error: expected declaration specifiers or '...' before numeric constant
arch/powerpc/boot/stdio.h:14:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'
arch/powerpc/boot/stdio.h:16:12: error: storage class specified for parameter 'vsprintf'
And went down hill from there (it produced hundreds of errors).
Caused by commit a52af697aaeb ("treewide: use __printf not __attribute__
((format(printf,...)))"). Maybe because some of these files are part of
the boot wrappers and are built (effectively) independently of the kernel
itself. Notice that arch/powerpc/boot/stdio.h does not include any
kernel headers ...
I have reverted that commit (and the follup ones b31d03e43e56
"treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes"
and f43c361e2bd9 "kernel.h/checkpatch: mark strict_strto<foo> and
simple_strto<foo> as obsolete") for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-28 9:56 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, David Miller, Huang Ying
Hi all,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
In file included from include/linux/irq_work.h:4:0,
from include/linux/perf_event.h:510,
from arch/sparc/mm/fault_32.c:21:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
In file included from include/linux/irq_work.h:4:0,
from include/linux/perf_event.h:510,
from arch/sparc/kernel/unaligned_32.c:18:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
In file included from include/linux/irq_work.h:4:0,
from include/linux/perf_event.h:510,
from kernel/sys.c:16:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
Caused by commit 510d7dc70eab ("llist: make all llist functions inline")
from the akpm tree.
I applied this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 19:51:38 +1000
Subject: [PATCH] llist: using in_nmi requires including hardirq.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/llist.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/llist.h b/include/linux/llist.h
index 5d23564..fb81b7b 100644
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
@@ -73,6 +73,7 @@ struct llist_node {
#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
#define CHECK_NMI_SAFE_CMPXCHG()
#else
+#include <linux/hardirq.h>
#define CHECK_NMI_SAFE_CMPXCHG() BUG_ON(in_nmi())
#endif
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (akpm tree related)
From: Stephen Rothwell @ 2011-09-28 10:01 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Andi Kleen
Hi all,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
fs/direct-io.c: In function '__blockdev_direct_IO':
fs/direct-io.c:1327:2: error: implicit declaration of function 'prefetch'
Caused by commit 30ddb4d48213 ("dio: optimize cache misses in the
submission path").
I have added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 19:58:28 +1000
Subject: [PATCH] dio: using prefetch requires including prefetch.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/direct-io.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index a05ca05..8d22849 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -36,6 +36,7 @@
#include <linux/rwsem.h>
#include <linux/uio.h>
#include <linux/atomic.h>
+#include <linux/prefetch.h>
/*
* How many user pages to map in one call to get_user_pages(). This determines
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: Tree for Sept 28
From: Stephen Rothwell @ 2011-09-28 10:04 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 36837 bytes --]
Hi all,
The linux-next tree is now available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable.
Changes since 20110927:
The net tree gained a conflict against the net-current tree.
The wireless tree gained a conflict against the wireless-current tree.
The trivial tree lost a conflict.
The pm tree gained a build failure so I used the version from
next-20110927.
The tmem tree lost its conflict.
The moduleh tree lost some conflicts but gained more against the net,
sound and staging trees. It also gained a build failures for which I
applied merge fix patches until it went too far and then I used the
version from next-20110927 for today.
The akpm tree gained a build failure for which I reverted 3 commits and 2
others for which I applied patches. Also, I dropped a couple of patches
that turned up elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 199 trees (counting Linus' and 27 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-scan.c
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
CONFLICT (content): Merge conflict in net/batman-adv/soft-interface.c
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/main.c
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in sound/mips/Kconfig
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/Kconfig
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
$ git reset --hard HEAD^
Merging refs/next/20110927/pm
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
[master b7cffd1] Merge commit 'refs/next/20110927/pm'
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Merging rcu/rcu/next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
Merging moduleh/for-sfr
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/tlb_nohash.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/debug.c
CONFLICT (content): Merge conflict in drivers/net/wireless/p54/txrx.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (delete/modify): drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/bcmsdh.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16201_ring.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16203_ring.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16204_ring.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16209_ring.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16220_core.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16240_ring.c
CONFLICT (content): Merge conflict in drivers/staging/iio/gyro/adis16060_core.c
CONFLICT (content): Merge conflict in drivers/staging/iio/gyro/adis16260_ring.c
CONFLICT (content): Merge conflict in drivers/staging/iio/meter/ade7758_ring.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (content): Merge conflict in net/mac80211/util.c
CONFLICT (content): Merge conflict in net/wireless/util.c
CONFLICT (content): Merge conflict in sound/soc/soc-io.c
$ git rm -f drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Applying: bcma: driver_chipcommon_pmu.c needs linux/export.h
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: x86, amd: include linux/elf.h since we use stuff from asm/elf.h
Applying: block/mtip32xx: include module.h for its utilities
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: mmc: using mopdule_param requires the inclusion of moduleparam.h
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: wireless/ath6kl: use of module_param requires the inclusion of moduleparam.h
$ git reset --hard HEAD^
Merging refs/next/20110927/moduleh
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/tlb_nohash.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (delete/modify): drivers/mfd/ab3550-core.c deleted in HEAD and modified in refs/next/20110927/moduleh. Version refs/next/20110927/moduleh of drivers/mfd/ab3550-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pci.c
CONFLICT (content): Merge conflict in drivers/s390/char/vmur.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
$ git rm -f drivers/mfd/ab3550-core.c
[master 7d3326d] Merge commit 'refs/next/20110927/moduleh'
Applying: dm: use export.h instead of module.h where possible
[master 1a99150] Merge commit 'refs/next/20110927/moduleh'
Applying: block: bsg-lib.c needs export.h not module.h
[master 145b298] Merge commit 'refs/next/20110927/moduleh'
Applying: PM: EXPORT_SYMBOL needs export.h
[master 67aeced] Merge commit 'refs/next/20110927/moduleh'
Applying: bcma: driver_chipcommon_pmu.c needs linux/export.h
[master 556ceca] Merge commit 'refs/next/20110927/moduleh'
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
[master bde5357] Merge commit 'refs/next/20110927/moduleh'
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
[master 6251656] Merge commit 'refs/next/20110927/moduleh'
Applying: x86, amd: include linux/elf.h since we use stuff from asm/elf.h
[master 245e804] Merge commit 'refs/next/20110927/moduleh'
Applying: block/mtip32xx: include module.h for its utilities
[master 950ab62] Merge commit 'refs/next/20110927/moduleh'
Applying: NFC: use of module facilities requires the inclusion of module.h
[master a7b6196] Merge commit 'refs/next/20110927/moduleh'
Applying: mmc: using mopdule_param requires the inclusion of moduleparam.h
[master a976a93] Merge commit 'refs/next/20110927/moduleh'
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
[master d7414cd] Merge commit 'refs/next/20110927/moduleh'
Applying: wireless/ath6kl: use of module_param requires the inclusion of moduleparam.h
[master da88344] Merge commit 'refs/next/20110927/moduleh'
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
Applying: arch/x86/kernel/cpu/perf_event_amd.c needs asm/apicdef.h
Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: hp_accel: Add a new PNP id
Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: btrfs: don't dereference extent_mapping if NULL
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: connector: add comm change event report to proc connector
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: drivers/block/mtip32xx/mtip32xx.c: fix warning
Applying: drivers/block/mtip32xx/mtip32xx.c needs compat.h
Applying: sparc, exec: remove redundant addr_limit assignment
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: Cross Memory Attach
Applying: cross-memory-attach-update
Applying: cross-memory-attach-v4
Applying: mm: compaction: trivial clean up in acct_isolated()
Applying: mm: change isolate mode from #define to bitwise type
Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
Applying: mm: compaction: make isolate_lru_page() filter-aware
Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
Applying: mm: migration: clean up unmap_and_move()
Applying: radix_tree: clean away saw_unset_tag leftovers
Applying: vmscan: add block plug for page reclaim
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: mm/page-writeback.c: document bdi_min_ratio
Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
Applying: oom: remove oom_disable_count
Applying: oom: fix race while temporarily setting current's oom_score_adj
Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
Applying: mm: output a list of loaded modules when we hit bad_page()
Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
Applying: mm: distinguish between mlocked and pinned pages
Applying: mm: add comments to explain mm_struct fields
Applying: mm-add-comments-to-explain-mm_struct-fields-fix
Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
Applying: xfs: warn if direct reclaim tries to writeback pages
Applying: ext4: warn if direct reclaim tries to writeback pages
Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
Applying: vmscan: count pages into balanced for zone with good watermark
Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
Applying: lib/string.c: introduce memchr_inv()
Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
Applying: mm/debug-pagealloc.c: use memchr_inv
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: memblock: add memblock_start_of_DRAM()
Applying: memblock: add NO_BOOTMEM config symbol
Applying: mremap: check for overflow using deltas
Applying: mremap: avoid sending one IPI per page
Applying: thp: mremap support and TLB optimization
Applying: thp-mremap-support-and-tlb-optimization-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
Applying: mm: neaten warn_alloc_failed
Applying: mm-neaten-warn_alloc_failed-fix
Applying: debug-pagealloc: add support for highmem pages
Applying: debug-pagealloc-add-support-for-highmem-pages-fix
Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm/memblock.c: small function definition fixes
Applying: mm: compaction: compact unevictable pages
Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
Applying: mm: compaction: accounting fix
Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm/vmalloc.c: report more vmalloc failures
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: thp: tail page refcounting fix
Applying: thp-tail-page-refcounting-fix-6
Applying: ksm: fix the comment of try_to_unmap_one()
Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
Applying: vmscan: fix shrinker callback bug in fs/super.c
Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
Applying: HWPOISON: convert pr_debug()s to pr_info()s
Applying: mm: compaction: make compact_zone_order() static
Applying: mm: fix kunmap_high() comment
Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: alpha: wire up accept4 syscall
Applying: alpha: wire up sendmmsg syscall
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: cris: lower the printk level in cris serial driver
Applying: kprobes: silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
Applying: x86: implement strict user copy checks for x86_64
Applying: Consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
Applying: consolidate-config_debug_strict_user_copy_checks-fix
Applying: fs/pipe.c: add ->statfs callback for pipefs
Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
Applying: hwmon: convert idr to ida and use ida_simple interface
Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
Applying: lis3lv02d: avoid divide by zero due to unchecked
Applying: lis3: update maintainer information
Applying: lis3: add support for HP EliteBook 2730p
Applying: lis3: add support for HP EliteBook 8540w
Applying: hp_accel: add HP ProBook 655x
Applying: lis3: free regulators if probe() fails
Applying: lis3: use consistent naming of variables
Applying: lis3: change exported function to use passed parameter
Applying: lis3: remove the references to the global variable in core driver
Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
Applying: lis3lv02d: make regulator API usage unconditional
Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
Applying: dynamic_debug: remove num_enabled accounting
Applying: dynamic_debug: use a single printk() to emit messages
Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
Applying: printk: add ignore_loglevel as module parameter
Applying: printk: add console_suspend module parameter
Applying: printk: fix bounds checking for log_prefix
Applying: printk: remove bounds checking for log_prefix
Applying: treewide: use __printf not __attribute__((format(printf,...)))
Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
Applying: fs/namei.c: remove unused getname_flags()
Applying: poll: add poll_requested_events() function
Applying: MAINTAINERS: add new entry for ideapad-laptop
Applying: video/backlight: remove obsolete cleanup for clientdata
Applying: backlight: fix broken regulator API usage in l4f00242t03
Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
Applying: leds: Renesas TPU LED driver
Applying: leds-renesas-tpu-led-driver-v2-fix
Applying: drivers/leds/led-triggers.c: fix memory leak
Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
Applying: lib/spinlock_debug.c: print owner on spinlock lockup
Applying: lib/bitmap.c: quiet sparse noise about address space
Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
Applying: lib/idr.c: fix comment for ida_get_new_above()
Applying: llist: make all llist functions inline
Applying: llist: define macro to check NMI safe cmpxchg
Applying: llist: move cpu_relax after cmpxchg
Applying: llist: return whether list is empty before adding in llist_add
Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
Applying: kernel/irq_work.c: use llist
Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: fix spurious lockdep warnings
Applying: epoll: limit paths
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
Applying: rtc: add initial support for mcp7941x parts
Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
Applying: minix: describe usage of different magic numbers
Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
Applying: cgroups: don't attach task to subsystem if migration failed
Applying: memcg: rename mem variable to memcg
Applying: memcg: fix oom schedule_timeout()
Applying: memcg: replace ss->id_lock with a rwlock
Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
Applying: memcg: skip scanning active lists based on individual size
Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
Applying: memcg: close race between charge and putback
Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
Applying: procfs: report EISDIR when reading sysctl dirs in proc
Applying: proc: fix races against execve() of /proc/PID/fd**
Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
Applying: proc: force dcache drop on unauthorized access
Applying: mm: restrict access to /proc/slabinfo
CONFLICT (content): Merge conflict in mm/slab.c
Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
Applying: RapidIO: add mport driver for Tsi721 bridge
Applying: RapidIO: Tsi721 driver - fixes for the initial release
Applying: RapidIO: fix potential null deref in rio_setup_device()
Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
Applying: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
Applying: pps: default echo function
Applying: pps: new client driver using GPIO
Applying: pps-new-client-driver-using-gpio-fix
Applying: pps gpio client: add missing dependency
Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Applying: drivers/w1/w1_int.c: multiple masters used same init_name
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: dio: separate fields only used in the submission path from struct dio
Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
Applying: dio: fix a wrong comment
Applying: dio: rearrange fields in dio/dio_submit to avoid holes
Applying: dio: use a slab cache for struct dio
Applying: dio: separate map_bh from dio
Applying: dio: inline the complete submission path
Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
Applying: dio: remove unnecessary dio argument from dio_pages_present()
Applying: dio: remove unused dio parameter from dio_bio_add_page()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Merging akpm
[master c9041ed] Revert "kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete"
[master cb09b65] Revert "treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes"
[master 7983034] Revert "treewide: use __printf not __attribute__((format(printf,...)))"
Applying: llist: using in_nmi requires including hardirq.h
Applying: dio: using prefetch requires including prefetch.h
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree
From: huang ying @ 2011-09-28 12:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, David Miller, Huang Ying
In-Reply-To: <20110928195601.9d0da0ea27186c4ce9349d94@canb.auug.org.au>
On Wed, Sep 28, 2011 at 5:56 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (sparc32 defconfig)
> failed like this:
>
> In file included from include/linux/irq_work.h:4:0,
> from include/linux/perf_event.h:510,
> from arch/sparc/mm/fault_32.c:21:
> include/linux/llist.h: In function 'llist_add':
> include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
> In file included from include/linux/irq_work.h:4:0,
> from include/linux/perf_event.h:510,
> from arch/sparc/kernel/unaligned_32.c:18:
> include/linux/llist.h: In function 'llist_add':
> include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
> In file included from include/linux/irq_work.h:4:0,
> from include/linux/perf_event.h:510,
> from kernel/sys.c:16:
> include/linux/llist.h: In function 'llist_add':
> include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
>
> Caused by commit 510d7dc70eab ("llist: make all llist functions inline")
> from the akpm tree.
Sorry, should have done at least building test for sparc. Will pay
more attention next time.
Best Regards,
Huang Ying
^ permalink raw reply
* Re: linux-next: build failure after merge of the moduleh tree
From: Paul Gortmaker @ 2011-09-28 13:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20110928184150.0fcf097b7f9128f8639059f3@canb.auug.org.au>
On 11-09-28 04:41 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) went on producing more failures (beyond those reported
> earlier). I have used the version of the moduleh tree from next-20110927
> for today and will see if I have more stamina tomorrow.
I will grab a copy of today's next and pick up where you left off, plowing
into the new additions in next that are implicitly using module.h
Thanks again for doing more than I could have asked.
Paul.
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2011-09-28 13:58 UTC (permalink / raw)
To: Ming Lei; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <CACVXFVMrPNZupCQnBMBXsSA1OH=15m9QBKhXT1Of+LghZbKn0Q@mail.gmail.com>
On Wednesday, September 28, 2011, Ming Lei wrote:
> Hi Stephen and Rafael,
>
> Sorry, the attachment patch can fix the build failure, which is
> caused by unset CONFIG_RUNTIME_PM.
First off, that's CONFIG_PM_RUNTIME. Second, why do you want to build
rpm-traces.c at all if CONFIG_PM_RUNTIME is unset?
Rafael
> On Wed, Sep 28, 2011 at 12:51 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Rafael,
> >
> > After merging the pm tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > In file included from include/trace/ftrace.h:567:0,
> > from include/trace/define_trace.h:96,
> > from include/trace/events/rpm.h:99,
> > from kernel/trace/rpm-traces.c:15:
> > include/trace/events/rpm.h: In function 'ftrace_raw_event_rpm_internal':
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
> > In file included from include/trace/ftrace.h:771:0,
> > from include/trace/define_trace.h:96,
> > from include/trace/events/rpm.h:99,
> > from kernel/trace/rpm-traces.c:15:
> > include/trace/events/rpm.h: In function 'perf_trace_rpm_internal':
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
> > include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
> >
> > Presumably caused by commit 53b615ccca56 ("PM / Runtime: Introduce trace
> > points for tracing rpm_* functions").
> >
> > I have used the pm tree from next-20110927 for today.
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/
> >
>
^ permalink raw reply
* Re: [PATCH -next] qdio: add missing export.h include
From: Paul Gortmaker @ 2011-09-28 14:03 UTC (permalink / raw)
To: Heiko Carstens; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <20110928063425.GA2621@osiris.boeblingen.de.ibm.com>
On 11-09-28 02:34 AM, Heiko Carstens wrote:
> On Tue, Sep 27, 2011 at 06:33:30PM -0400, Paul Gortmaker wrote:
>> On 11-09-22 03:21 AM, Heiko Carstens wrote:
>>> Fix compile breakage caused by splitting module.h:
>>>
>>> drivers/s390/cio/qdio_setup.c:31:1:
>>> warning: data definition has no type or storage class [enabled by default]
>>> drivers/s390/cio/qdio_setup.c:31:1:
>>> warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
>>
>> Now that I look at this, and the other patch, I'm not
>> seeing how this is possible. Unless there is some
>> convoluted CPP magic going on, I don't see any instances
>> of EXPORT_SYMBOL in qdio_setup.c -- similarly I don't
>> see any module_ or MODULE_ references in zfcp_qdio.c
>>
>> Am I missing something obvious here? The line numbers
>> you quote dont match anything meaningful -- so I'm wondering
>> if perhaps these changes are meant to be in advance of the
>> s390 changes you've got queued in next -- which is fine, but
>> it would be nice to have that called out.
>
> Oh right, I should have mentioned this. Sorry!
> he two patches fix compile breakages only in -next because of s390
> related patches in the scsi and net git trees. Since it's not possible
> to add the compile fixes (at least for the new export.h header file)
> to the scsi or net trees I just sent these patches towards you...
OK, thanks for the info. I'll update the commit header with
a note indicating those two changes are in anticipation of
pending s390 changes.
Paul.
>
> Thanks,
> Heiko
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2011-09-28 14:47 UTC (permalink / raw)
To: Ming Lei; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <201109281558.05289.rjw@sisk.pl>
On Wednesday, September 28, 2011, Rafael J. Wysocki wrote:
> On Wednesday, September 28, 2011, Ming Lei wrote:
> > Hi Stephen and Rafael,
> >
> > Sorry, the attachment patch can fix the build failure, which is
> > caused by unset CONFIG_RUNTIME_PM.
>
> First off, that's CONFIG_PM_RUNTIME. Second, why do you want to build
> rpm-traces.c at all if CONFIG_PM_RUNTIME is unset?
IOW, what about the appended patch instead?
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: PM / Tracing: Build runtime PM tracepoints if PM_RUNTIME is set
Do not build kernel/trace/rpm-traces.c if CONFIG_PM_RUNTIME is not
set, which avoids a build failure.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
kernel/power/Kconfig | 4 ++++
kernel/trace/Makefile | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
Index: linux/kernel/power/Kconfig
===================================================================
--- linux.orig/kernel/power/Kconfig
+++ linux/kernel/power/Kconfig
@@ -238,3 +238,7 @@ config PM_GENERIC_DOMAINS
config PM_GENERIC_DOMAINS_RUNTIME
def_bool y
depends on PM_RUNTIME && PM_GENERIC_DOMAINS
+
+config RUNTIME_PM_TRACEPOINTS
+ def_bool y
+ depends on PM_RUNTIME && TRACEPOINTS
Index: linux/kernel/trace/Makefile
===================================================================
--- linux.orig/kernel/trace/Makefile
+++ linux/kernel/trace/Makefile
@@ -53,7 +53,7 @@ endif
obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
-obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
+obj-$(CONFIG_RUNTIME_PM_TRACEPOINTS) += rpm-traces.o
ifeq ($(CONFIG_TRACING),y)
obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
endif
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Ming Lei @ 2011-09-28 14:47 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <201109281558.05289.rjw@sisk.pl>
Hi,
2011/9/28 Rafael J. Wysocki <rjw@sisk.pl>:
> On Wednesday, September 28, 2011, Ming Lei wrote:
>> Hi Stephen and Rafael,
>>
>> Sorry, the attachment patch can fix the build failure, which is
>> caused by unset CONFIG_RUNTIME_PM.
>
> First off, that's CONFIG_PM_RUNTIME. Second, why do you want to build
> rpm-traces.c at all if CONFIG_PM_RUNTIME is unset?
>
Yes, you are right, follows the correct fix:
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index 56bdab5..f49405f 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -53,7 +53,9 @@ endif
obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
+ifeq ($(CONFIG_PM_RUNTIME),y)
obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
+endif
ifeq ($(CONFIG_TRACING),y)
obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
endif
thanks,
--
Ming Lei
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox