* Re: linux-next: manual merge of the net tree with the net-current tree
From: David Miller @ 2011-09-28 5:36 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, ordex, lindner_marek
In-Reply-To: <20110928125428.70d5cf10ea59f729135d5dff@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 12:54:28 +1000
> Today's linux-next merge of the net tree got a conflict in
> net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
> do_bcast has to be true for broadcast packets only") from the net-current
> tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
> sender side") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yep, I'll do a merge soon to fix this up for good, thanks Stephen!
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Ming Lei @ 2011-09-28 5:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Rafael J. Wysocki, linux-next, linux-kernel
In-Reply-To: <20110928145144.3d074db9aa9b6f858e0dc4fb@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
Hi Stephen and Rafael,
Sorry, the attachment patch can fix the build failure, which is
caused by unset CONFIG_RUNTIME_PM.
thanks,
--
Ming Lei
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/
>
[-- Attachment #2: 0001-kernel-trace-rpm-traces.c-fix-build-failure-if-RUNTI.patch --]
[-- Type: text/x-patch, Size: 910 bytes --]
From feb037e957149f0dc405b80b4bb9cdafec6fcb0f Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Wed, 28 Sep 2011 13:07:04 +0800
Subject: [PATCH] kernel/trace/rpm-traces.c: fix build failure if RUNTIME_PM
unset
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
kernel/trace/rpm-traces.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/rpm-traces.c b/kernel/trace/rpm-traces.c
index 998949e..c161c5e 100644
--- a/kernel/trace/rpm-traces.c
+++ b/kernel/trace/rpm-traces.c
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/usb.h>
+#ifdef CONFIG_PM_RUNTIME
#define CREATE_TRACE_POINTS
#include <trace/events/rpm.h>
@@ -18,4 +19,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_return_int);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_idle);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_suspend);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_resume);
+#endif
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH -next] qdio: add missing export.h include
From: Stephen Rothwell @ 2011-09-28 4:54 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Heiko Carstens, linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <4E824F3A.6070302@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 896 bytes --]
Hi Paul,
On Tue, 27 Sep 2011 18:33:30 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> 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.
There is a patch in the net tree in linux-next that adds two
EXPORT_SYMBOL_GPLs to qdio_setup.c.
--
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 pm tree
From: Stephen Rothwell @ 2011-09-28 4:51 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Ming Lei
[-- Attachment #1: Type: text/plain, Size: 2127 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless tree with the wireless-current tree
From: Stephen Rothwell @ 2011-09-28 3:19 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Jouni Malinen
Hi John,
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/wireless/nl80211.c
index 1b79a56,bf3fc4f..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4304,14 -4300,7 +4300,10 @@@ static int nl80211_crypto_settings(stru
if (len % sizeof(u32))
return -EINVAL;
+ if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
+ return -EINVAL;
+
memcpy(settings->akm_suites, data, len);
-
- for (i = 0; i < settings->n_akm_suites; i++)
- if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
- return -EINVAL;
}
return 0;
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Greg KH @ 2011-09-27 14:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Paul Gortmaker, Igor M. Liplianin,
Mauro Carvalho Chehab
In-Reply-To: <20110927161055.05bbb0586fffbfbb2307f30b@canb.auug.org.au>
On Tue, Sep 27, 2011 at 04:10:55PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/misc/altera-stapl/altera.c between commit cff4fa8415a3 ("[media]
> altera-stapl: it is time to move out from staging") from the v4l-dvb tree
> and commit 99c978529a40 ("staging: Add module.h to drivers/staging
> users") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks fine, thanks.
greg k-h
^ permalink raw reply
* linux-next: manual merge of the net tree with the net-current tree
From: Stephen Rothwell @ 2011-09-28 2:54 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Antonio Quartulli, Marek Lindner
Hi all,
Today's linux-next merge of the net tree got a conflict in
net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
do_bcast has to be true for broadcast packets only") from the net-current
tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
sender side") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/batman-adv/soft-interface.c
index 05dd351,aceeabc..0000000
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -595,11 -596,12 +596,12 @@@ static int interface_tx(struct sk_buff
goto dropped;
/* Register the client MAC in the transtable */
- tt_local_add(soft_iface, ethhdr->h_source);
+ tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
- orig_node = transtable_search(bat_priv, ethhdr->h_dest);
+ orig_node = transtable_search(bat_priv, ethhdr->h_source,
+ ethhdr->h_dest);
- if (is_multicast_ether_addr(ethhdr->h_dest) ||
- (orig_node && orig_node->gw_flags)) {
+ do_bcast = is_multicast_ether_addr(ethhdr->h_dest);
+ if (do_bcast || (orig_node && orig_node->gw_flags)) {
ret = gw_is_target(bat_priv, skb, orig_node);
if (ret < 0)
^ permalink raw reply
* Re: linux-next: New location for the module.h split content
From: Stephen Rothwell @ 2011-09-28 1:13 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, LKML
In-Reply-To: <20110928003903.GA16710@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
Hi Paul,
On Tue, 27 Sep 2011 20:39:04 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> I've placed the module split content for linux-next on one of
> our local servers as per the pull request info below, to serve
> as an alternate source while kernel.org is down.
>
> --------
>
> The following changes since commit b6fd41e29dea9c6753b1843a77e50433e6123bcb:
>
> Linux 3.1-rc6 (2011-09-12 14:02:02 -0700)
>
> are available in the git repository at:
> git://openlinux.windriver.com/people/paulg/linux-next for-sfr
I will switch to this from 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
* Re: linux-next: manual merge of the akpm tree with the tree
From: Stephen Rothwell @ 2011-09-27 23:03 UTC (permalink / raw)
To: Vaibhav Nagarnaik
Cc: Andrew Morton, linux-next, linux-kernel, Frederic Weisbecker,
Paul E. McKenney
In-Reply-To: <CAL26m8JbvOi05irJdhtsas2=PWdy4V+hkTYHp029RAvDGnUZgA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
Hi,
On Tue, 27 Sep 2011 09:52:27 -0700 Vaibhav Nagarnaik <vnagarnaik@google.com> wrote:
>
> Looks good to me. Do I need to provide Acked-by?
Not to me, that is just a merge fixup patch in linux-next. It is not
permanent until Andrew or Linus actually take the original patches and
merge them.
But it good to know that it is probablt correct, thanks.
--
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: [BUG?] anyone aware of pagecache issues with 2.6.27?
From: Chris Friesen @ 2011-09-27 22:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20110928085519.ba69b44b767b3f201dcbc366@canb.auug.org.au>
On 09/27/2011 04:55 PM, Stephen Rothwell wrote:
> Hi Chris,
>
> On Tue, 27 Sep 2011 09:46:41 -0600 Chris Friesen<chris.friesen@genband.com> wrote:
>>
>> I realize this is a long shot, but I figure it's worth a try.
>
> You would be much better off asking this on linux-kernel rather than linux-next.
No kidding...obviously didn't catch the erroneous auto-complete. Sorry
for the typo.
Chris
--
Chris Friesen
Software Developer
GENBAND
chris.friesen@genband.com
www.genband.com
^ permalink raw reply
* Re: [PATCH -next] rtlwifi: rtl8192c: Add includes of export.h
From: Paul Gortmaker @ 2011-09-27 22:58 UTC (permalink / raw)
To: Larry Finger; +Cc: linux-wireless, linux-kernel, linux-next, sfr, akpm
In-Reply-To: <4e7a6393.eQ0IEnMVbVlQIbx0%Larry.Finger@lwfinger.net>
On 11-09-21 06:22 PM, Larry Finger wrote:
> With the split of include/linux/module.h into two parts, several files in
> drivers rtlwifi and rtl8192c need to include the new file.
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> ---
>
> Paul,
>
> At Randy Dunlap's suggestion, I am sending this to you in hopes that
> I can save you some time. I think I found all the routines that will have
> a problem, but as these patches do not compile, I cannot be sure.
Hi Larry -- thanks for the patch, but...
>
> Larry
> ---
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/base.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
> @@ -30,6 +30,7 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/ip.h>
> +#include <linux/export.h>
This one needs module.h (which it has in my current tree) because it
calls module_init and module_exit. All the other ones in your patch
match what I have in tree already though, so that is a good double
check to have. There are some other ones that I found through many
randconfig builds that aren't in your patch. Here is the current list
in my tree:
~/git/module.h/linux-2.6.git$ git diff ^v3.1-rc6 HEAD drivers/net/wireless/rtlwifi |diffstat
base.c | 1 +
cam.c | 1 +
efuse.c | 1 +
pci.c | 1 +
ps.c | 1 +
rtl8192c/dm_common.c | 1 +
rtl8192c/fw_common.c | 1 +
rtl8192c/main.c | 1 +
rtl8192c/phy_common.c | 1 +
rtl8192ce/sw.c | 1 +
rtl8192cu/sw.c | 1 +
rtl8192de/sw.c | 1 +
rtl8192se/sw.c | 1 +
usb.c | 1 +
14 files changed, 14 insertions(+)
Thanks,
Paul.
> #include "wifi.h"
> #include "rc.h"
> #include "base.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/cam.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
> @@ -29,6 +29,8 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> +#include <linux/export.h>
Have this already.
> +
> #include "wifi.h"
> #include "cam.h"
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/efuse.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "wifi.h"
> #include "efuse.h"
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/pci.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "core.h"
> #include "wifi.h"
> #include "pci.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/ps.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "wifi.h"
> #include "base.h"
> #include "ps.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "dm_common.h"
> #include "phy_common.h"
> #include "../pci.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> @@ -30,6 +30,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/firmware.h>
> +#include <linux/export.h>
> +
> #include "../wifi.h"
> #include "../pci.h"
> #include "../base.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "../wifi.h"
> #include "../rtl8192ce/reg.h"
> #include "../rtl8192ce/def.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/usb.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
> @@ -28,6 +28,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/usb.h>
> +#include <linux/export.h>
> +
> #include "core.h"
> #include "wifi.h"
> #include "usb.h"
^ permalink raw reply
* Re: [BUG?] anyone aware of pagecache issues with 2.6.27?
From: Stephen Rothwell @ 2011-09-27 22:55 UTC (permalink / raw)
To: Chris Friesen; +Cc: linux-next
In-Reply-To: <4E81EFE1.9090000@genband.com>
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi Chris,
On Tue, 27 Sep 2011 09:46:41 -0600 Chris Friesen <chris.friesen@genband.com> wrote:
>
> I realize this is a long shot, but I figure it's worth a try.
You would be much better off asking this on linux-kernel rather than linux-next.
--
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: [PATCH -next] qdio: add missing export.h include
From: Paul Gortmaker @ 2011-09-27 22:33 UTC (permalink / raw)
To: Heiko Carstens; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <1316676108-5729-1-git-send-email-heiko.carstens@de.ibm.com>
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.
Thanks,
Paul.
>
> Cc: Frank Blaschka <blaschka@linux.vnet.ibm.com>
> Cc: Jan Glauber <jang@linux.vnet.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> drivers/s390/cio/qdio_setup.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
> index d9a46a4..25f4988 100644
> --- a/drivers/s390/cio/qdio_setup.c
> +++ b/drivers/s390/cio/qdio_setup.c
> @@ -7,6 +7,7 @@
> * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
> */
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/slab.h>
> #include <asm/qdio.h>
>
^ permalink raw reply
* Re: [PATCH -next] qdio: add missing export.h include
From: Paul Gortmaker @ 2011-09-27 22:17 UTC (permalink / raw)
To: Heiko Carstens; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <1316676108-5729-1-git-send-email-heiko.carstens@de.ibm.com>
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]
Thanks, I've squashed this into what contained the other
s390 changes from you, which now touches the following:
arch/s390/crypto/sha_common.c | 1 +
arch/s390/mm/init.c | 1 +
drivers/s390/char/fs3270.c | 1 +
drivers/s390/char/sclp_cpi_sys.c | 1 +
drivers/s390/char/vmcp.c | 1 +
drivers/s390/char/vmur.c | 1 +
drivers/s390/cio/chp.c | 2 ++
drivers/s390/cio/qdio_debug.c | 2 ++
drivers/s390/cio/qdio_setup.c | 1 +
drivers/s390/kvm/kvm_virtio.c | 1 +
drivers/s390/scsi/zfcp_aux.c | 1 +
drivers/s390/scsi/zfcp_ccw.c | 1 +
drivers/s390/scsi/zfcp_dbf.c | 1 +
drivers/s390/scsi/zfcp_scsi.c | 1 +
14 files changed, 16 insertions(+)
Paul.
>
> Cc: Frank Blaschka <blaschka@linux.vnet.ibm.com>
> Cc: Jan Glauber <jang@linux.vnet.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> drivers/s390/cio/qdio_setup.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
> index d9a46a4..25f4988 100644
> --- a/drivers/s390/cio/qdio_setup.c
> +++ b/drivers/s390/cio/qdio_setup.c
> @@ -7,6 +7,7 @@
> * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
> */
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/slab.h>
> #include <asm/qdio.h>
>
^ permalink raw reply
* Re: linux-next: Tree for Sept 27 (power/qos.c)
From: Randy Dunlap @ 2011-09-27 22:07 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, LKML, pm list
In-Reply-To: <201109272205.12021.rjw@sisk.pl>
On 09/27/2011 01:05 PM, Rafael J. Wysocki wrote:
> On Tuesday, September 27, 2011, Randy Dunlap wrote:
>> On 09/27/2011 12:35 AM, Stephen Rothwell wrote:
>>> Hi all,
>>
>>
>> When CONFIG_PM_SLEEP is not enabled:
>>
>> drivers/base/power/qos.c:231:29: error: 'struct dev_pm_info' has no member named 'entry'
>
> Thanks for the report.
>
> Below is a patch and it should be fixed in linux-next now.
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> Rafael
>
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
> Subject: PM / QoS: Fix build issue for CONFIG_PM_SLEEP unset
>
> Commit d41a041b58684710638cbc0d5342a661b50db124 "PM / QoS: Add
> function dev_pm_qos_read_value() (v2)" introduced a build problem
> for CONFIG_PM_SLEEP, because it overlooked this case entirely.
>
> To fix this issue, use the power.power_state in struct device to
> indicate whether or not PM QoS constraints can be applied to the
> device object in question instead of checking the device's
> power.entry field that is valid only for CONFIG_PM_SLEEP set.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
> drivers/base/power/main.c | 2 +-
> drivers/base/power/power.h | 10 +++++++++-
> drivers/base/power/qos.c | 11 ++++-------
> include/linux/pm.h | 2 ++
> include/linux/pm_qos.h | 9 +++++++--
> 5 files changed, 23 insertions(+), 11 deletions(-)
>
> Index: linux/drivers/base/power/main.c
> ===================================================================
> --- linux.orig/drivers/base/power/main.c
> +++ linux/drivers/base/power/main.c
> @@ -22,7 +22,6 @@
> #include <linux/mutex.h>
> #include <linux/pm.h>
> #include <linux/pm_runtime.h>
> -#include <linux/pm_qos.h>
> #include <linux/resume-trace.h>
> #include <linux/interrupt.h>
> #include <linux/sched.h>
> @@ -67,6 +66,7 @@ void device_pm_init(struct device *dev)
> spin_lock_init(&dev->power.lock);
> pm_runtime_init(dev);
> INIT_LIST_HEAD(&dev->power.entry);
> + dev->power.power_state = PMSG_INVALID;
> }
>
> /**
> Index: linux/include/linux/pm.h
> ===================================================================
> --- linux.orig/include/linux/pm.h
> +++ linux/include/linux/pm.h
> @@ -326,6 +326,7 @@ extern struct dev_pm_ops generic_subsys_
> * requested by a driver.
> */
>
> +#define PM_EVENT_INVALID (-1)
> #define PM_EVENT_ON 0x0000
> #define PM_EVENT_FREEZE 0x0001
> #define PM_EVENT_SUSPEND 0x0002
> @@ -346,6 +347,7 @@ extern struct dev_pm_ops generic_subsys_
> #define PM_EVENT_AUTO_SUSPEND (PM_EVENT_AUTO | PM_EVENT_SUSPEND)
> #define PM_EVENT_AUTO_RESUME (PM_EVENT_AUTO | PM_EVENT_RESUME)
>
> +#define PMSG_INVALID ((struct pm_message){ .event = PM_EVENT_INVALID, })
> #define PMSG_ON ((struct pm_message){ .event = PM_EVENT_ON, })
> #define PMSG_FREEZE ((struct pm_message){ .event = PM_EVENT_FREEZE, })
> #define PMSG_QUIESCE ((struct pm_message){ .event = PM_EVENT_QUIESCE, })
> Index: linux/drivers/base/power/power.h
> ===================================================================
> --- linux.orig/drivers/base/power/power.h
> +++ linux/drivers/base/power/power.h
> @@ -1,3 +1,5 @@
> +#include <linux/pm_qos.h>
> +
> #ifdef CONFIG_PM_RUNTIME
>
> extern void pm_runtime_init(struct device *dev);
> @@ -35,15 +37,21 @@ extern void device_pm_move_last(struct d
> static inline void device_pm_init(struct device *dev)
> {
> spin_lock_init(&dev->power.lock);
> + dev->power.power_state = PMSG_INVALID;
> pm_runtime_init(dev);
> }
>
> +static inline void device_pm_add(struct device *dev)
> +{
> + dev_pm_qos_constraints_init(dev);
> +}
> +
> static inline void device_pm_remove(struct device *dev)
> {
> + dev_pm_qos_constraints_destroy(dev);
> pm_runtime_remove(dev);
> }
>
> -static inline void device_pm_add(struct device *dev) {}
> static inline void device_pm_move_before(struct device *deva,
> struct device *devb) {}
> static inline void device_pm_move_after(struct device *deva,
> Index: linux/include/linux/pm_qos.h
> ===================================================================
> --- linux.orig/include/linux/pm_qos.h
> +++ linux/include/linux/pm_qos.h
> @@ -7,6 +7,7 @@
> #include <linux/plist.h>
> #include <linux/notifier.h>
> #include <linux/miscdevice.h>
> +#include <linux/device.h>
>
> #define PM_QOS_RESERVED 0
> #define PM_QOS_CPU_DMA_LATENCY 1
> @@ -142,9 +143,13 @@ static inline int dev_pm_qos_remove_glob
> struct notifier_block *notifier)
> { return 0; }
> static inline void dev_pm_qos_constraints_init(struct device *dev)
> - { return; }
> +{
> + dev->power.power_state = PMSG_ON;
> +}
> static inline void dev_pm_qos_constraints_destroy(struct device *dev)
> - { return; }
> +{
> + dev->power.power_state = PMSG_INVALID;
> +}
> #endif
>
> #endif
> Index: linux/drivers/base/power/qos.c
> ===================================================================
> --- linux.orig/drivers/base/power/qos.c
> +++ linux/drivers/base/power/qos.c
> @@ -149,6 +149,7 @@ void dev_pm_qos_constraints_init(struct
> {
> mutex_lock(&dev_pm_qos_mtx);
> dev->power.constraints = NULL;
> + dev->power.power_state = PMSG_ON;
> mutex_unlock(&dev_pm_qos_mtx);
> }
>
> @@ -165,6 +166,7 @@ void dev_pm_qos_constraints_destroy(stru
>
> mutex_lock(&dev_pm_qos_mtx);
>
> + dev->power.power_state = PMSG_INVALID;
> c = dev->power.constraints;
> if (!c)
> goto out;
> @@ -222,20 +224,15 @@ int dev_pm_qos_add_request(struct device
>
> req->dev = dev;
>
> - device_pm_lock();
> mutex_lock(&dev_pm_qos_mtx);
>
> - if (dev->power.constraints) {
> - device_pm_unlock();
> - } else {
> - if (list_empty(&dev->power.entry)) {
> + if (!dev->power.constraints) {
> + if (dev->power.power_state.event == PM_EVENT_INVALID) {
> /* The device has been removed from the system. */
> - device_pm_unlock();
> req->dev = NULL;
> ret = -ENODEV;
> goto out;
> } else {
> - device_pm_unlock();
> /*
> * Allocate the constraints data on the first call to
> * add_request, i.e. only if the data is not already
> --
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Russell King @ 2011-09-27 21:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, linux-next, linux-kernel, Catalin Marinas,
Jon Medhurst
In-Reply-To: <201109271724.46371.arnd@arndb.de>
On Tue, Sep 27, 2011 at 05:24:46PM +0200, Arnd Bergmann wrote:
> Do you generally send one pull request for each branch you have
> in the for-next branch, or do you send a single request for something
> that roughly resembles the for-next branch at the time of the merge
> window?
It depends how much is queued and how I feel towards the stuff which
is queued. I've tended to send initially a big pull request of 'ARM
updates' which contains mostly everything, though I've also sent
pull requests for individual topic branches when it makes more sense.
At the moment, the diffstat summary says:
423 files changed, 3054 insertions(+), 2855 deletions(-)
but there's quite a spread outside arch/arm this time around due to
the GPIO stuff I'm carrying (mostly the change of mach/gpio.h to
asm/gpio.h).
So, at least the GPIO stuff will be a completely separate pull request
from the rest of the ARM stuff. The 'amba' (primecell) changes will
probably also be a separate pull request because it touches stuff
outside of the arch/arm sub-tree (even though its ARM related.)
What I term 'devel-stable' (iow, stuff I've pulled in from other people
and a few bits of my own stuff which others are using) won't be split
up (that'd negate the point of devel-stable being... stable as it'd
mean there's commits in there which can't be relied upon.)
That leaves 'the rest' which I'll make a decision nearer the time,
along with deciding whether devel-stable ends up being part of
'the rest' or not.
What I will try to do is get the bulk of it in fairly early in the
merge cycle as normal.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Paul Gortmaker @ 2011-09-27 20:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Igor M. Liplianin,
Mauro Carvalho Chehab
In-Reply-To: <20110927161055.05bbb0586fffbfbb2307f30b@canb.auug.org.au>
On 11-09-27 02:10 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/misc/altera-stapl/altera.c between commit cff4fa8415a3 ("[media]
> altera-stapl: it is time to move out from staging") from the v4l-dvb tree
> and commit 99c978529a40 ("staging: Add module.h to drivers/staging
> users") from the staging tree.
Hey Greg/Stephen,
So that I could revalidate the module.h stuff with randconfig builds,
I've taken the above staging commit and re-applied it to the module.h
tree -- I'm pretty sure git will see it as the same commit and just
move on with no complaints, but just a heads up for Stephen in case.
This won't happen until Stephen takes the module.h from one of our
internal servers as a temporary measure while kernel.org is down.
I'll be sending that information to linux-next and Stephen later
today.
Paul.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
>
> Mauro, you could, of course, apply Paul's patch to the file in its new
> location.
^ permalink raw reply
* Re: linux-next: Tree for Sept 27 (power/qos.c)
From: Rafael J. Wysocki @ 2011-09-27 20:05 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, pm list
In-Reply-To: <4E81FA1E.3060702@xenotime.net>
On Tuesday, September 27, 2011, Randy Dunlap wrote:
> On 09/27/2011 12:35 AM, Stephen Rothwell wrote:
> > Hi all,
>
>
> When CONFIG_PM_SLEEP is not enabled:
>
> drivers/base/power/qos.c:231:29: error: 'struct dev_pm_info' has no member named 'entry'
Thanks for the report.
Below is a patch and it should be fixed in linux-next now.
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: PM / QoS: Fix build issue for CONFIG_PM_SLEEP unset
Commit d41a041b58684710638cbc0d5342a661b50db124 "PM / QoS: Add
function dev_pm_qos_read_value() (v2)" introduced a build problem
for CONFIG_PM_SLEEP, because it overlooked this case entirely.
To fix this issue, use the power.power_state in struct device to
indicate whether or not PM QoS constraints can be applied to the
device object in question instead of checking the device's
power.entry field that is valid only for CONFIG_PM_SLEEP set.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/base/power/main.c | 2 +-
drivers/base/power/power.h | 10 +++++++++-
drivers/base/power/qos.c | 11 ++++-------
include/linux/pm.h | 2 ++
include/linux/pm_qos.h | 9 +++++++--
5 files changed, 23 insertions(+), 11 deletions(-)
Index: linux/drivers/base/power/main.c
===================================================================
--- linux.orig/drivers/base/power/main.c
+++ linux/drivers/base/power/main.c
@@ -22,7 +22,6 @@
#include <linux/mutex.h>
#include <linux/pm.h>
#include <linux/pm_runtime.h>
-#include <linux/pm_qos.h>
#include <linux/resume-trace.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -67,6 +66,7 @@ void device_pm_init(struct device *dev)
spin_lock_init(&dev->power.lock);
pm_runtime_init(dev);
INIT_LIST_HEAD(&dev->power.entry);
+ dev->power.power_state = PMSG_INVALID;
}
/**
Index: linux/include/linux/pm.h
===================================================================
--- linux.orig/include/linux/pm.h
+++ linux/include/linux/pm.h
@@ -326,6 +326,7 @@ extern struct dev_pm_ops generic_subsys_
* requested by a driver.
*/
+#define PM_EVENT_INVALID (-1)
#define PM_EVENT_ON 0x0000
#define PM_EVENT_FREEZE 0x0001
#define PM_EVENT_SUSPEND 0x0002
@@ -346,6 +347,7 @@ extern struct dev_pm_ops generic_subsys_
#define PM_EVENT_AUTO_SUSPEND (PM_EVENT_AUTO | PM_EVENT_SUSPEND)
#define PM_EVENT_AUTO_RESUME (PM_EVENT_AUTO | PM_EVENT_RESUME)
+#define PMSG_INVALID ((struct pm_message){ .event = PM_EVENT_INVALID, })
#define PMSG_ON ((struct pm_message){ .event = PM_EVENT_ON, })
#define PMSG_FREEZE ((struct pm_message){ .event = PM_EVENT_FREEZE, })
#define PMSG_QUIESCE ((struct pm_message){ .event = PM_EVENT_QUIESCE, })
Index: linux/drivers/base/power/power.h
===================================================================
--- linux.orig/drivers/base/power/power.h
+++ linux/drivers/base/power/power.h
@@ -1,3 +1,5 @@
+#include <linux/pm_qos.h>
+
#ifdef CONFIG_PM_RUNTIME
extern void pm_runtime_init(struct device *dev);
@@ -35,15 +37,21 @@ extern void device_pm_move_last(struct d
static inline void device_pm_init(struct device *dev)
{
spin_lock_init(&dev->power.lock);
+ dev->power.power_state = PMSG_INVALID;
pm_runtime_init(dev);
}
+static inline void device_pm_add(struct device *dev)
+{
+ dev_pm_qos_constraints_init(dev);
+}
+
static inline void device_pm_remove(struct device *dev)
{
+ dev_pm_qos_constraints_destroy(dev);
pm_runtime_remove(dev);
}
-static inline void device_pm_add(struct device *dev) {}
static inline void device_pm_move_before(struct device *deva,
struct device *devb) {}
static inline void device_pm_move_after(struct device *deva,
Index: linux/include/linux/pm_qos.h
===================================================================
--- linux.orig/include/linux/pm_qos.h
+++ linux/include/linux/pm_qos.h
@@ -7,6 +7,7 @@
#include <linux/plist.h>
#include <linux/notifier.h>
#include <linux/miscdevice.h>
+#include <linux/device.h>
#define PM_QOS_RESERVED 0
#define PM_QOS_CPU_DMA_LATENCY 1
@@ -142,9 +143,13 @@ static inline int dev_pm_qos_remove_glob
struct notifier_block *notifier)
{ return 0; }
static inline void dev_pm_qos_constraints_init(struct device *dev)
- { return; }
+{
+ dev->power.power_state = PMSG_ON;
+}
static inline void dev_pm_qos_constraints_destroy(struct device *dev)
- { return; }
+{
+ dev->power.power_state = PMSG_INVALID;
+}
#endif
#endif
Index: linux/drivers/base/power/qos.c
===================================================================
--- linux.orig/drivers/base/power/qos.c
+++ linux/drivers/base/power/qos.c
@@ -149,6 +149,7 @@ void dev_pm_qos_constraints_init(struct
{
mutex_lock(&dev_pm_qos_mtx);
dev->power.constraints = NULL;
+ dev->power.power_state = PMSG_ON;
mutex_unlock(&dev_pm_qos_mtx);
}
@@ -165,6 +166,7 @@ void dev_pm_qos_constraints_destroy(stru
mutex_lock(&dev_pm_qos_mtx);
+ dev->power.power_state = PMSG_INVALID;
c = dev->power.constraints;
if (!c)
goto out;
@@ -222,20 +224,15 @@ int dev_pm_qos_add_request(struct device
req->dev = dev;
- device_pm_lock();
mutex_lock(&dev_pm_qos_mtx);
- if (dev->power.constraints) {
- device_pm_unlock();
- } else {
- if (list_empty(&dev->power.entry)) {
+ if (!dev->power.constraints) {
+ if (dev->power.power_state.event == PM_EVENT_INVALID) {
/* The device has been removed from the system. */
- device_pm_unlock();
req->dev = NULL;
ret = -ENODEV;
goto out;
} else {
- device_pm_unlock();
/*
* Allocate the constraints data on the first call to
* add_request, i.e. only if the data is not already
^ permalink raw reply
* [PATCH -next] dmar: fix build warnings when ACPI is not enabled
From: Randy Dunlap @ 2011-09-27 17:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Vinod Koul, Dan Williams, Andrew Morton
In-Reply-To: <20110926172348.be01ff9a1c16267ffd000d2a@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build warnings when CONFIG_ACPI is not enabled:
include/linux/dmar.h:248:46: warning: 'struct acpi_dmar_header' declared inside parameter list
include/linux/dmar.h:248:46: warning: its scope is only this definition or declaration, which is probably not what you want
include/linux/dmar.h:252:46: warning: 'struct acpi_dmar_header' declared inside parameter list
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
include/linux/dmar.h | 2 ++
1 file changed, 2 insertions(+)
--- next-2011-0927.orig/include/linux/dmar.h
+++ next-2011-0927/include/linux/dmar.h
@@ -244,6 +244,8 @@ extern int dmar_parse_dev_scope(void *st
struct pci_dev ***devices, u16 segment);
extern int intel_iommu_init(void);
#else /* !CONFIG_INTEL_IOMMU: */
+struct acpi_dmar_header;
+
static inline int intel_iommu_init(void) { return -ENODEV; }
static inline int dmar_parse_one_rmrr(struct acpi_dmar_header *header)
{
^ permalink raw reply
* [PATCH -next] x86: perf_event_amd.c needs <asm/apicdef.h>
From: Randy Dunlap @ 2011-09-27 17:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Robert Richter, Ingo Molnar, Andre Przywara,
Andrew Morton
In-Reply-To: <20110926172348.be01ff9a1c16267ffd000d2a@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build error by adding <asm/apicdef.h> header file:
arch/x86/kernel/cpu/perf_event_amd.c:350:2: error: 'BAD_APICID' undeclared (first use in this function)
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
Found in linux-next and patch only applies cleanly to linux-next,
but looks like mainline could use a similar patch (with more
header files).
arch/x86/kernel/cpu/perf_event_amd.c | 1 +
1 file changed, 1 insertion(+)
--- next-2011-0927.orig/arch/x86/kernel/cpu/perf_event_amd.c
+++ next-2011-0927/arch/x86/kernel/cpu/perf_event_amd.c
@@ -2,6 +2,7 @@
#include <linux/types.h>
#include <linux/init.h>
#include <linux/slab.h>
+#include <asm/apicdef.h>
#include "perf_event.h"
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the tree
From: Vaibhav Nagarnaik @ 2011-09-27 16:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Frederic Weisbecker,
Paul E. McKenney
In-Reply-To: <20110927165920.14b00e8595d10135d2a4397a@canb.auug.org.au>
On Mon, Sep 26, 2011 at 11:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got conflicts in
> arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
> arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
> commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
> the rcu tree and commit 6a541324a31f ("The current interrupt traces from
> irq_handler_entry and irq_handler_exit") from the akpm tree.
>
> Just context changes. I fixed them up (see below) and can carry the fixes
> as necessary.
Looks good to me. Do I need to provide Acked-by?
Vaibhav Nagarnaik
^ permalink raw reply
* Re: linux-next: Tree for Sept 27 (power/qos.c)
From: Randy Dunlap @ 2011-09-27 16:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Rafael J. Wysocki, pm list
In-Reply-To: <20110927173530.ceae2e49537a81da65287bf3@canb.auug.org.au>
On 09/27/2011 12:35 AM, Stephen Rothwell wrote:
> Hi all,
When CONFIG_PM_SLEEP is not enabled:
drivers/base/power/qos.c:231:29: error: 'struct dev_pm_info' has no member named 'entry'
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* [BUG?] anyone aware of pagecache issues with 2.6.27?
From: Chris Friesen @ 2011-09-27 15:46 UTC (permalink / raw)
To: linux-next
I realize this is a long shot, but I figure it's worth a try.
What we're seeing is that "cached" gets large (several gigs) and "free"
gets small, and when we get into this state our system responsiveness
starts dropping. If I do "echo 3 > /proc/sys/vm/drop_caches", then it
immediately frees up a couple gig of memory and things work as expected.
Based on the fact that memory is immediately reclaimable from the cache
it appears that the bulk of the cache is clean pages. This shouldn't
have a major impact on memory allocation, but at least on this setup it
does. It seems like there is something not quite right about the
mechanism that reclaims clean pages from the cache. Is anyone aware of
issues in this area for 2.6.27-vintage kernels?
Is there a way to limit how much memory gets used for the page cache?
drop_caches seems to help, but it's a really big hammer.
System details:
2.6.27 kernel, x86-64, 8GB RAM, no swap. Root is on a tmpfs filesystem,
local disks are used for miscellaneous stuff including /var/log, we have
some sizeable network-mounted filesystems.
/proc/sys/vm/overcommit_memory is set to 2, with overcommit_ratio set to
100.
Thanks,
Chris
--
Chris Friesen
Software Developer
GENBAND
chris.friesen@genband.com
www.genband.com
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Arnd Bergmann @ 2011-09-27 15:24 UTC (permalink / raw)
To: Russell King
Cc: Stephen Rothwell, linux-next, linux-kernel, Catalin Marinas,
Jon Medhurst
In-Reply-To: <20110927072517.GB11359@flint.arm.linux.org.uk>
On Tuesday 27 September 2011, Russell King wrote:
> On Tue, Sep 27, 2011 at 11:25:24AM +1000, Stephen Rothwell wrote:
> > Hi Arnd,
> >
> > [I have a feeling that I may have reported this previously]
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mm/dma-mapping.c between commit e73fc88e19d7 ("ARM: 7059/1:
> > LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*") from the arm tree
> > and commit 99d1717dd7fe ("ARM: Add init_consistent_dma_size()") from the
> > arm-soc tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as necessary.
Ok, looks good.
> This has happened because I've dropped a large chunk of my tree from the
> for-next branch due to some horrible conflicts and some bad workflow
> practice in a git tree I recently merged (so this merge which I'd
> normally do has been exposed.)
Since we have a few conflicts already, I think I'll wait for your
tree to go in first and then send my pull requests with the proper
fixups. I could already pull in some branches that I know I will
have to wait for.
Do you generally send one pull request for each branch you have
in the for-next branch, or do you send a single request for something
that roughly resembles the for-next branch at the time of the merge
window?
Arnd
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the mfd tree
From: Paul Gortmaker @ 2011-09-27 14:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus Walleij, Samuel Ortiz
In-Reply-To: <20110927162919.1bf769d918a16a35d91ac1da@canb.auug.org.au>
On Tue, Sep 27, 2011 at 2:29 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
> ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
> module.h to the implicit drivers/mfd users") from the moduleh tree.
>
> The former removes this file, so I did that.
Thanks -- I'll simply drop the changes to that file. I'll have an alternate
pull site for linux-next to you by your tomorrow morning as well.
P.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
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