* Re: linux-next: manual merge of the trivial tree with the tree
From: Stephen Rothwell @ 2009-02-05 22:23 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, Nick Andrew, Tejun Heo, Jeff Garzik
In-Reply-To: <alpine.LNX.1.10.0902051358270.11630@jikos.suse.cz>
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
Hi Jiri,
On Thu, 5 Feb 2009 13:59:40 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>
> Thanks. As the libata patch is apparently now in Linus' tree, I have now
> resolved this conflict in my tree, so you should be able to drop this
> fixup in the next round of linux-next merging.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tip-core tree with Linus' tree
From: Stephen Rothwell @ 2009-02-06 2:26 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next, James Bottomley
Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
arch/x86/mach-voyager/voyager_smp.c between commit
92ab78315c638515d0e81b0c70b2082f713582d9 ("x86/Voyager: make it build and
boot") from Linus' tree and commit
552be871e67ff577ed36beb2f53d078b42304739 ("x86: pass in cpu number to
switch_to_new_gdt()") from the tip-core tree.
I used the resolution from tip/master (see below -worth checking that I
got it right). (Though I assume that there is no reason that the other
uses of smp_processor_id() in voyager_smp_prepare_boot_cpu could be
replaced by "cpu" as well?)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/mach-voyager/voyager_smp.c
index 7ffcdee,58c7cac..0000000
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@@ -1745,14 -1746,13 +1744,13 @@@ static void __init voyager_smp_prepare_
static void __cpuinit voyager_smp_prepare_boot_cpu(void)
{
- init_gdt(smp_processor_id());
- switch_to_new_gdt();
+ int cpu = smp_processor_id();
+ switch_to_new_gdt(cpu);
- cpu_set(cpu, cpu_online_map);
- cpu_set(cpu, cpu_callout_map);
- cpu_set(cpu, cpu_possible_map);
- cpu_set(cpu, cpu_present_map);
+ cpu_online_map = cpumask_of_cpu(smp_processor_id());
+ cpu_callout_map = cpumask_of_cpu(smp_processor_id());
+ cpu_callin_map = CPU_MASK_NONE;
+ cpu_present_map = cpumask_of_cpu(smp_processor_id());
-
}
static int __cpuinit voyager_cpu_up(unsigned int cpu)
@@@ -1779,12 -1779,11 +1777,11 @@@ static void __init voyager_smp_cpus_don
void __init smp_setup_processor_id(void)
{
current_thread_info()->cpu = hard_smp_processor_id();
- x86_write_percpu(cpu_number, hard_smp_processor_id());
}
-static void voyager_send_call_func(cpumask_t callmask)
+static void voyager_send_call_func(const struct cpumask *callmask)
{
- __u32 mask = cpus_addr(callmask)[0] & ~(1 << smp_processor_id());
+ __u32 mask = cpus_addr(*callmask)[0] & ~(1 << smp_processor_id());
send_CPI(mask, VIC_CALL_FUNCTION_CPI);
}
^ permalink raw reply
* Siemens BONANZA
From: Siemens Award Team @ 2009-02-06 2:31 UTC (permalink / raw)
Your Email ID Has been awarded the sum of £750,000.00 GBP in
our Recent Siemens BONANZA for this year.get back to this
office with your details via (agt_bwilliams02@live.com)
Name:
Country:
Sex:
Age:
Address:
Mrs Mercy Bill
(Information Officer)
^ permalink raw reply
* linux-next: manual merge of the pci tree with the pci-current tree
From: Stephen Rothwell @ 2009-02-06 2:50 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pcie/portdrv_pci.c between commit
27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca ("PCI: PCIe portdrv: Simplify
suspend and resume") from the pci-current tree and commit
120d3f44dd4c7a16ac71f26d4ff44ad7498cb81a ("PCI: PCIe portdrv: Implement
pm object") from the pci tree.
I fixed it up (I used the pci tree version) and assume it will be fixed in
the pci tree soon.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: quota tree build failure
From: Stephen Rothwell @ 2009-02-06 3:18 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
Hi Jan,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/nfsd/vfs.c: In function 'nfsd_setattr':
fs/nfsd/vfs.c:359: error: implicit declaration of function 'DQUOT_INIT'
Caused by commit 74d9386bc58d5f8b5bcee051e04e7123cd9cac88 ("quota: Remove
uppercase aliases for quota functions"). Seems you missed at least one
of the users.
I have dropped the quota tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: ide tree build failure
From: Stephen Rothwell @ 2009-02-06 3:35 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
Hi Bart,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/ide/scc_pata.c: In function 'scc_tf_load':
drivers/ide/scc_pata.c:675: error: 'IDE_TFLAG_FLAGGED' undeclared (first use in this function)
Caused by commit 0b6008f9f765b9988b3f86c5fe74cd9873d34c61 ("ide: add
"flagged" taskfile flags to struct ide_taskfile").
I have dropped the ide tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the security-testing tree with Linus' tree
From: Stephen Rothwell @ 2009-02-06 7:23 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, Christoph Hellwig, Al Viro, Mimi Zohar
Hi James,
Today's linux-next merge of the security-testing tree got a conflict in
fs/namei.c between commit cb23beb55100171646e69e248fb45f10db6e99a4 ("kill
vfs_permission") from Linus' tree and commit
6146f0d5e47ca4047ffded0fb79b6c25359b386c ("integrity: IMA hooks") from
the security-testing tree.
Just a context change. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/namei.c
index bbc15c2,734f2b5..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -848,8 -860,9 +849,10 @@@ static int __link_path_walk(const char
nd->flags |= LOOKUP_CONTINUE;
err = exec_permission_lite(inode);
if (err == -EAGAIN)
- err = vfs_permission(nd, MAY_EXEC);
+ err = inode_permission(nd->path.dentry->d_inode,
+ MAY_EXEC);
+ if (!err)
+ err = ima_path_check(&nd->path, MAY_EXEC);
if (err)
break;
@@@ -1506,9 -1525,14 +1509,14 @@@ int may_open(struct path *path, int acc
flag &= ~O_TRUNC;
}
- error = vfs_permission(nd, acc_mode);
+ error = inode_permission(inode, acc_mode);
if (error)
return error;
+
+ error = ima_path_check(&nd->path,
+ acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
+ if (error)
+ return error;
/*
* An append-only file must be opened in append mode for writing.
*/
^ permalink raw reply
* linux-next: security-testing tree build failure
From: Stephen Rothwell @ 2009-02-06 7:28 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, Christoph Hellwig, Al Viro, Mimi Zohar
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
Hi James,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/namei.c: In function 'may_open':
fs/namei.c:1516: error: 'nd' undeclared (first use in this function)
Caused by commit 6146f0d5e47ca4047ffded0fb79b6c25359b386c ("integrity:
IMA hooks").
The "nd" parameter to may_open() was removed in commit
3fb64190aa3c23c10e6e9fd0124ac030115c99bf ("pass a struct path * to
may_open") before 2.6.29-rc1.
I have dropped the security-testing tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the security-testing tree with Linus' tree
From: James Morris @ 2009-02-06 8:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Christoph Hellwig, Al Viro, Mimi Zohar
In-Reply-To: <20090206182337.6673aabc.sfr@canb.auug.org.au>
On Fri, 6 Feb 2009, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security-testing tree got a conflict in
> fs/namei.c between commit cb23beb55100171646e69e248fb45f10db6e99a4 ("kill
> vfs_permission") from Linus' tree and commit
> 6146f0d5e47ca4047ffded0fb79b6c25359b386c ("integrity: IMA hooks") from
> the security-testing tree.
>
> Just a context change. I fixed it up (see below) and can carry the fix
> for a while.
It was already fixed in my tree earlier today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc fs/namei.c
> index bbc15c2,734f2b5..0000000
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@@ -848,8 -860,9 +849,10 @@@ static int __link_path_walk(const char
> nd->flags |= LOOKUP_CONTINUE;
> err = exec_permission_lite(inode);
> if (err == -EAGAIN)
> - err = vfs_permission(nd, MAY_EXEC);
> + err = inode_permission(nd->path.dentry->d_inode,
> + MAY_EXEC);
> + if (!err)
> + err = ima_path_check(&nd->path, MAY_EXEC);
> if (err)
> break;
>
> @@@ -1506,9 -1525,14 +1509,14 @@@ int may_open(struct path *path, int acc
> flag &= ~O_TRUNC;
> }
>
> - error = vfs_permission(nd, acc_mode);
> + error = inode_permission(inode, acc_mode);
> if (error)
> return error;
> +
> + error = ima_path_check(&nd->path,
> + acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
> + if (error)
> + return error;
> /*
> * An append-only file must be opened in append mode for writing.
> */
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* Re: linux-next: security-testing tree build failure
From: James Morris @ 2009-02-06 8:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Christoph Hellwig, Al Viro, Mimi Zohar
In-Reply-To: <20090206182831.c18a56a0.sfr@canb.auug.org.au>
On Fri, 6 Feb 2009, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> fs/namei.c: In function 'may_open':
> fs/namei.c:1516: error: 'nd' undeclared (first use in this function)
>
> Caused by commit 6146f0d5e47ca4047ffded0fb79b6c25359b386c ("integrity:
> IMA hooks").
>
> The "nd" parameter to may_open() was removed in commit
> 3fb64190aa3c23c10e6e9fd0124ac030115c99bf ("pass a struct path * to
> may_open") before 2.6.29-rc1.
>
> I have dropped the security-testing tree for today.
This was also fixed before I pushed my tree out (can you re-pull the
security-testing tree at ~11am your time if you get a conflict? chances
are I've fixed it by then).
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* [linux-next][PATCH] revert headers_check fix: ia64, fpu.h
From: KOSAKI Motohiro @ 2009-02-06 8:19 UTC (permalink / raw)
To: Jaswinder Singh Rajput
Cc: kosaki.motohiro, Ingo Molnar, Linus Torvalds, Sam Ravnborg,
Andrew Morton, Russell King - ARM Linux, hskinnemoen, cooloney,
tony.luck, ralf, dhowells, matthew, chris, LKML, linux-next,
linux-ia64
In-Reply-To: <1233385816.17794.16.camel@localhost.localdomain>
> diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
> index 3859558..b6395ad 100644
> --- a/arch/ia64/include/asm/fpu.h
> +++ b/arch/ia64/include/asm/fpu.h
> @@ -6,7 +6,7 @@
> * David Mosberger-Tang <davidm@hpl.hp.com>
> */
>
> -#include <asm/types.h>
> +#include <linux/types.h>
this change break ia64 build perfectly.
this patch seems don't tested at all.
Ingo, I hope you ask patch author how to test posted patch ;-)
==
Subject: [PATCH] revert headers_check fix: ia64, fpu.h
commit fa9ea6c7abd94482ecd84e130676b6a1b3e61c2c break ia64 build perfectly.
it because ia64 has following include file dependency.
entry.S
-> asm/processor.h
-> asm/ptrace.h
-> asm/fpu.h
Then, above commit introduce below dependency.
entry.S
-> asm/processor.h
-> asm/ptrace.h
-> asm/fpu.h
-> linux/types.h
-> linux/posix_types.h
-> linux/stddef.h
Then, assembler can't intepret following statement in stddef.h
enum {
false = 0,
true = 1
};
Therefore, >100 line tons error was outputed.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Jaswinder Singh Rajput <jaswinder@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next <linux-next@vger.kernel.org>
Cc: linux-ia64 <linux-ia64@vger.kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
---
arch/ia64/include/asm/fpu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/arch/ia64/include/asm/fpu.h
===================================================================
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
@@ -6,7 +6,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-#include <linux/types.h>
+#include <asm/types.h>
/* floating point status register: */
#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
^ permalink raw reply
* Re: [PATCH] revert headers_check fix: ia64, fpu.h
From: Jaswinder Singh Rajput @ 2009-02-06 8:53 UTC (permalink / raw)
To: KOSAKI Motohiro
Cc: Jaswinder Singh Rajput, Ingo Molnar, Linus Torvalds, Sam Ravnborg,
Andrew Morton, Russell King - ARM Linux, hskinnemoen, cooloney,
tony.luck, ralf, dhowells, matthew, chris, LKML, linux-next,
linux-ia64
In-Reply-To: <20090206164546.6291.KOSAKI.MOTOHIRO@jp.fujitsu.com>
[-- Attachment #1: Type: text/plain, Size: 1559 bytes --]
On Fri, Feb 6, 2009 at 1:49 PM, KOSAKI Motohiro
<kosaki.motohiro@jp.fujitsu.com> wrote:
>
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> Cc: Jaswinder Singh Rajput <jaswinder@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-next <linux-next@vger.kernel.org>
> Cc: linux-ia64 <linux-ia64@vger.kernel.org>
> Cc: Tony Luck <tony.luck@intel.com>
> ---
> arch/ia64/include/asm/fpu.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: b/arch/ia64/include/asm/fpu.h
> ===================================================================
> --- a/arch/ia64/include/asm/fpu.h
> +++ b/arch/ia64/include/asm/fpu.h
> @@ -6,7 +6,7 @@
> * David Mosberger-Tang <davidm@hpl.hp.com>
> */
>
> -#include <linux/types.h>
> +#include <asm/types.h>
>
No , we do not even need asm/types.h
Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
for arch/ia64/include/asm/fpu.h
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/ia64/include/asm/fpu.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
index b6395ad..0c26157 100644
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
@@ -6,8 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-#include <linux/types.h>
-
/* floating point status register: */
#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */
--
1.6.1.1
[-- Attachment #2: 0001-Neither-asm-types.h-nor-linux-types.h-is-not-require.patch --]
[-- Type: text/x-patch, Size: 868 bytes --]
From 64e19dcc60cf9cd1455af5b0a9aaf45e7f00dde8 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Fri, 6 Feb 2009 08:43:29 +0000
Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required for arch/ia64/include/asm/fpu.h
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/ia64/include/asm/fpu.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
index b6395ad..0c26157 100644
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
@@ -6,8 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-#include <linux/types.h>
-
/* floating point status register: */
#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */
--
1.6.1.1
^ permalink raw reply related
* Re: linux-next: slab tree build warning
From: Pekka Enberg @ 2009-02-06 8:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Christoph Lameter, linux-next, Nick Piggin
In-Reply-To: <Pine.LNX.4.64.0902041009050.32130@melkki.cs.Helsinki.FI>
On Wed, 2009-02-04 at 10:11 +0200, Pekka J Enberg wrote:
> On Wed, 4 Feb 2009, Stephen Rothwell wrote:
> > Today's linux-next build (powerpc allnoconfig) produced this warning:
> >
> > mm/slqb.c: In function 'kmem_cache_open':
> > mm/slqb.c:2180: warning: label 'error_lock' defined but not used
> > mm/slqb.c:2176: warning: label 'error_cpu_array' defined but not used
> >
> > Caused by commit 8b9ffd9d52479bd17b5729c9f3acaefa90c7e585 ("slqb: dynamic
> > array allocations").
> >
> > Clearly neither CONFIG_SMP not CONFIG_NUMA is set.
>
> Here's a simple fix for it. It would probably be better to get rid of the
> #ifdefs in kmem_cache_open() with empty static inlines for the
> !CONFIG_SMP and !CONFIG_NUMA cases.
>
> Nick, I did not apply this patch yet so ACK/NAK, please.
I went ahead and merged my patch.
Pekka
^ permalink raw reply
* Re: [linux-next][PATCH] revert headers_check fix: ia64, fpu.h
From: KOSAKI Motohiro @ 2009-02-06 9:11 UTC (permalink / raw)
To: Jaswinder Singh Rajput
Cc: kosaki.motohiro, Jaswinder Singh Rajput, Ingo Molnar,
Linus Torvalds, Sam Ravnborg, Andrew Morton,
Russell King - ARM Linux, hskinnemoen, cooloney, tony.luck, ralf,
dhowells, matthew, chris, LKML, linux-next, linux-ia64
In-Reply-To: <3f9a31f40902060053x18dacf58u40c739ab89f13860@mail.gmail.com>
> > Index: b/arch/ia64/include/asm/fpu.h
> > ===================================================================
> > --- a/arch/ia64/include/asm/fpu.h
> > +++ b/arch/ia64/include/asm/fpu.h
> > @@ -6,7 +6,7 @@
> > * David Mosberger-Tang <davidm@hpl.hp.com>
> > */
> >
> > -#include <linux/types.h>
> > +#include <asm/types.h>
> >
>
> No , we do not even need asm/types.h
>
> Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
> for arch/ia64/include/asm/fpu.h
>
> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
ok. I confirmed.
Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
thanks.
> ---
> arch/ia64/include/asm/fpu.h | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
> index b6395ad..0c26157 100644
> --- a/arch/ia64/include/asm/fpu.h
> +++ b/arch/ia64/include/asm/fpu.h
> @@ -6,8 +6,6 @@
> * David Mosberger-Tang <davidm@hpl.hp.com>
> */
>
> -#include <linux/types.h>
> -
> /* floating point status register: */
> #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
> #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */
> --
> 1.6.1.1
^ permalink raw reply
* Re: [PATCH/RFC] m68k: atari - Rename "mfp" to "st_mfp"
From: Andreas Schwab @ 2009-02-06 10:37 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Linux/m68k, Stephen Rothwell, linux-next
In-Reply-To: <Pine.LNX.4.64.0902052159220.16817@anakin>
Geert Uytterhoeven <geert@linux-m68k.org> writes:
> Atari guys: If I'm not mistaken, the first MFP is the ST-MFP?
Right.
Andreas.
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply
* linux-next: Tree for February 6
From: Stephen Rothwell @ 2009-02-06 11:45 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7883 bytes --]
Hi all,
Changes since 20090205:
Removed tree:
cpu_alloc (until work recommences)
Dropped trees (temporarily):
quota (build problem)
ide (build problem)
security-testing (build problem)
audit (difficult conflicts)
The tip-core tree gained a conflict against Linus' tree.
The pci tree gained a conflict against the pci-current tree.
The quota tree gained a build failure and was dropped.
The ide tree lost its 2 conflicts but gained a build failure and was
dropped.
The security-testing tree gained a conflict against Linus' tree and a
build failure and was dropped.
The proc tree lost its conflict.
The cpufreq tree lost its build failure.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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,
ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 131 trees (counting Linus' and 18 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/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 kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
CONFLICT (content): Merge conflict in drivers/char/tty_audit.c
CONFLICT (content): Merge conflict in kernel/auditsc.c
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (content): Merge conflict in arch/arm/configs/magician_defconfig
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in arch/x86/mach-voyager/voyager_smp.c
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
$ git reset --hard HEAD^
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
$ git reset --hard HEAD^
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Created commit d79806d: Revert "platform/x86: Add oqo-wmi driver for model 2 OQO backlight and rfkill control"
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in fs/namei.c
$ git reset --hard HEAD^
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/dma_remapping.h
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging squashfs/master
Merging omap/for-next
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] revert headers_check fix: ia64, fpu.h
From: Sam Ravnborg @ 2009-02-06 13:42 UTC (permalink / raw)
To: KOSAKI Motohiro
Cc: Jaswinder Singh Rajput, Ingo Molnar, Linus Torvalds,
Andrew Morton, Russell King - ARM Linux, hskinnemoen, cooloney,
tony.luck, ralf, dhowells, matthew, chris, LKML, linux-next,
linux-ia64
In-Reply-To: <20090206164546.6291.KOSAKI.MOTOHIRO@jp.fujitsu.com>
On Fri, Feb 06, 2009 at 05:19:00PM +0900, KOSAKI Motohiro wrote:
> > diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
> > index 3859558..b6395ad 100644
> > --- a/arch/ia64/include/asm/fpu.h
> > +++ b/arch/ia64/include/asm/fpu.h
> > @@ -6,7 +6,7 @@
> > * David Mosberger-Tang <davidm@hpl.hp.com>
> > */
> >
> > -#include <asm/types.h>
> > +#include <linux/types.h>
>
> this change break ia64 build perfectly.
> this patch seems don't tested at all.
>
> Ingo, I hope you ask patch author how to test posted patch ;-)
Patch author test the patch by adding it to a git tree that hits -next.
And this catched ths bug - so -next served its purpose.
Sam
^ permalink raw reply
* Re: linux-next: manual merge of the tip-core tree with Linus' tree
From: Ingo Molnar @ 2009-02-06 13:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, H. Peter Anvin, linux-next, James Bottomley
In-Reply-To: <20090206132601.b207fb0e.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip-core tree got a conflict in
> arch/x86/mach-voyager/voyager_smp.c between commit
> 92ab78315c638515d0e81b0c70b2082f713582d9 ("x86/Voyager: make it build and
> boot") from Linus' tree and commit
> 552be871e67ff577ed36beb2f53d078b42304739 ("x86: pass in cpu number to
> switch_to_new_gdt()") from the tip-core tree.
>
> I used the resolution from tip/master (see below -worth checking that I
> got it right). (Though I assume that there is no reason that the other
> uses of smp_processor_id() in voyager_smp_prepare_boot_cpu could be
> replaced by "cpu" as well?)
Thanks!
Note that the x86/Voyager code will have to be totally reworked ontop of the
new x86 subarch code and that the cpumask logic there is largely obsolete
(in the context of linux-next) and cannot be triggered via any
Kconfig-reachable build mode anymore.
I've pushed out a next tip/auto-core-next branch so the conflict should
disappear from your tree.
Note that there's another upcoming conflict, in arch/x86/mm/fault.c, due to
this upstream commit from a few hours ago:
9be260a: prevent kprobes from catching spurious page faults
This will conflict both with the pagefault cleanups in tip/x86/mm and with
tip/kmemcheck so it's a non-trivial 3-way conflict. I've resolved the
conflicts explicitly on the Git level and pushed out a freshly integrated
x86-next, core-next and kmemcheck-next tree as well - so you should not be
seeing conflicts in that area.
Note: take care because these trees also contain a lot of new stuff: the x86
APIC and subarch rewrite, the shiny new percpu changes and cleanup and more.
Let us know if you run into any trouble with them.
Thanks,
Ingo
^ permalink raw reply
* linux-next test scripts
From: Uwe Kleine-König @ 2009-02-06 14:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hello Stephen,
I plan to setup something similar to linux-next for the Pengutronix test
lab to build a tree that contains the work of all our developers for
daily testing.
It would be really great if I could take a look into your scripts to
manage linux-next. I tried searching the web for them, but without
success.
Are the scripts somewhere available without being found by me? If yes,
where are they, if not, do you can publish them somewhere?
Best regards and thanks in advance,
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: [PATCH] revert headers_check fix: ia64, fpu.h
From: Ingo Molnar @ 2009-02-06 14:55 UTC (permalink / raw)
To: KOSAKI Motohiro
Cc: Jaswinder Singh Rajput, Jaswinder Singh Rajput, Linus Torvalds,
Sam Ravnborg, Andrew Morton, Russell King - ARM Linux,
hskinnemoen, cooloney, tony.luck, ralf, dhowells, matthew, chris,
LKML, linux-next, linux-ia64
In-Reply-To: <20090206180957.6294.KOSAKI.MOTOHIRO@jp.fujitsu.com>
* KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> wrote:
> > > Index: b/arch/ia64/include/asm/fpu.h
> > > ===================================================================
> > > --- a/arch/ia64/include/asm/fpu.h
> > > +++ b/arch/ia64/include/asm/fpu.h
> > > @@ -6,7 +6,7 @@
> > > * David Mosberger-Tang <davidm@hpl.hp.com>
> > > */
> > >
> > > -#include <linux/types.h>
> > > +#include <asm/types.h>
> > >
> >
> > No , we do not even need asm/types.h
> >
> > Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
> > for arch/ia64/include/asm/fpu.h
> >
> > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
>
> ok. I confirmed.
> Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Thanks.
Jaswinder, mind adding these tags to the commit and sending a pull request
with all fixes?
Ingo
^ permalink raw reply
* next-20090206: kernel BUG at mm/slub.c:1132
From: Alexander Beregalov @ 2009-02-06 15:10 UTC (permalink / raw)
To: linux-kernel, linux-mm, linux-btrfs, linux-next@vger.kernel.org
Hi
I run dbench on btrfs, which is on file on xfs
btrfs: disabling barriers on dev /dev/loop/0
------------[ cut here ]------------
kernel BUG at mm/slub.c:1132!
invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
last sysfs file: /sys/kernel/uevent_seqnum
CPU 1
Modules linked in:
Pid: 2078, comm: loop0 Not tainted 2.6.29-rc3-next-20090206 #1
RIP: 0010:[<ffffffff802c25ae>] [<ffffffff802c25ae>] __slab_alloc+0x41e/0x610
RSP: 0018:ffff88007b17d620 EFLAGS: 00010202
RAX: 0000000000000000 RBX: 0000000000120012 RCX: 0000000000000010
RDX: 0000000000000000 RSI: ffffffff802c2301 RDI: ffffffff8026c12d
RBP: ffff88007b17d670 R08: 0000000000000001 R09: 0000000000000000
R10: ffff88007dbbce40 R11: 0000000000000000 R12: 0000000000000000
R13: ffff88007db82ed8 R14: ffff88007d2554a8 R15: ffff88007d255488
FS: 0000000000000000(0000) GS:ffff880004dd6000(0000) knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 00007ff50c1bb000 CR3: 000000006c19d000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process loop0 (pid: 2078, threadinfo ffff88007b17c000, task ffff88007dbbce40)
Stack:
ffffffff802c27d9 ffffffff804379f7 ffffffff7d255488 0000001000120012
ffff88007b17d660 0000000000000000 0000000000000202 0000000000120012
ffff88007d255488 ffffffff804379f7 ffff88007b17d6b0 ffffffff802c2896
Call Trace:
[<ffffffff802c27d9>] ? kmem_cache_alloc+0x39/0x100
[<ffffffff804379f7>] ? alloc_extent_state+0x17/0xa0
[<ffffffff804379f7>] ? alloc_extent_state+0x17/0xa0
[<ffffffff802c2896>] kmem_cache_alloc+0xf6/0x100
[<ffffffff804379f7>] alloc_extent_state+0x17/0xa0
[<ffffffff80439246>] clear_extent_bit+0x1a6/0x2e0
[<ffffffff80439cee>] try_release_extent_state+0x7e/0xa0
[<ffffffff80439e62>] try_release_extent_mapping+0x152/0x180
[<ffffffff802a0520>] ? __remove_mapping+0xd0/0x100
[<ffffffff804212f6>] __btrfs_releasepage+0x36/0x70
[<ffffffff80421355>] btrfs_releasepage+0x25/0x30
[<ffffffff8029391e>] try_to_release_page+0x2e/0x60
[<ffffffff802a1542>] shrink_page_list+0x572/0x860
[<ffffffff8062db3b>] ? _spin_unlock_irq+0x2b/0x60
[<ffffffff802a1ae1>] ? shrink_list+0x2b1/0x680
[<ffffffff802a1afd>] shrink_list+0x2cd/0x680
[<ffffffff802358a0>] ? sub_preempt_count+0xc0/0x130
[<ffffffff8062dbb2>] ? _spin_unlock_irqrestore+0x42/0x80
[<ffffffff80475890>] ? __up_write+0x70/0x120
[<ffffffff802a211b>] shrink_zone+0x26b/0x380
[<ffffffff802a2b35>] try_to_free_pages+0x255/0x3d0
[<ffffffff8029fc00>] ? isolate_pages_global+0x0/0x270
[<ffffffff8029a767>] __alloc_pages_internal+0x237/0x590
[<ffffffff80295545>] grab_cache_page_write_begin+0x85/0xd0
[<ffffffff8062b88c>] ? __mutex_lock_common+0x37c/0x4d0
[<ffffffff804fd7b3>] ? do_lo_send_aops+0x43/0x190
[<ffffffff802ee577>] block_write_begin+0x87/0xf0
[<ffffffff803eeee5>] xfs_vm_write_begin+0x25/0x30
[<ffffffff803ef270>] ? xfs_get_blocks+0x0/0x20
[<ffffffff802938eb>] pagecache_write_begin+0x1b/0x20
[<ffffffff804fd823>] do_lo_send_aops+0xb3/0x190
[<ffffffff8062db3b>] ? _spin_unlock_irq+0x2b/0x60
[<ffffffff802358a0>] ? sub_preempt_count+0xc0/0x130
[<ffffffff804fdd45>] loop_thread+0x445/0x4e0
[<ffffffff804fd770>] ? do_lo_send_aops+0x0/0x190
[<ffffffff80259420>] ? autoremove_wake_function+0x0/0x40
[<ffffffff804fd900>] ? loop_thread+0x0/0x4e0
[<ffffffff80258f76>] kthread+0x56/0x90
[<ffffffff8020ce5a>] child_rip+0xa/0x20
[<ffffffff80235759>] ? finish_task_switch+0x89/0x110
[<ffffffff8062db46>] ? _spin_unlock_irq+0x36/0x60
[<ffffffff8020c840>] ? restore_args+0x0/0x30
[<ffffffff80258f20>] ? kthread+0x0/0x90
[<ffffffff8020ce50>] ? child_rip+0x0/0x20
Code: e8 18 69 1b 00 e9 48 ff ff ff 31 c9 48 c7 c2 00 4f 81 80 89 c6
e8 93 7f fd ff 48 89 c3 48 85 c0 0f 85 73 fe ff ff e9 91 fd ff ff <0f>
0b eb fe 49 83 7f 60 00 90 0f 84 2d fd ff ff 4c 89 f7 e8 aa
RIP [<ffffffff802c25ae>] __slab_alloc+0x41e/0x610
RSP <ffff88007b17d620>
^ permalink raw reply
* Re: [linux-next][PATCH] revert headers_check fix: ia64, fpu.h
From: Jaswinder Singh Rajput @ 2009-02-06 15:29 UTC (permalink / raw)
To: Ingo Molnar
Cc: KOSAKI Motohiro, Jaswinder Singh Rajput, Linus Torvalds,
Sam Ravnborg, Andrew Morton, Russell King - ARM Linux,
hskinnemoen, cooloney, tony.luck, ralf, dhowells, matthew, chris,
LKML, linux-next, linux-ia64
In-Reply-To: <20090206145556.GH18368@elte.hu>
On Fri, 2009-02-06 at 15:55 +0100, Ingo Molnar wrote:
> * KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> wrote:
>
> > > > Index: b/arch/ia64/include/asm/fpu.h
> > > > ===================================================================
> > > > --- a/arch/ia64/include/asm/fpu.h
> > > > +++ b/arch/ia64/include/asm/fpu.h
> > > > @@ -6,7 +6,7 @@
> > > > * David Mosberger-Tang <davidm@hpl.hp.com>
> > > > */
> > > >
> > > > -#include <linux/types.h>
> > > > +#include <asm/types.h>
> > > >
> > >
> > > No , we do not even need asm/types.h
> > >
> > > Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
> > > for arch/ia64/include/asm/fpu.h
> > >
> > > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> >
> > ok. I confirmed.
> > Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> > Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
>
> Thanks.
>
> Jaswinder, mind adding these tags to the commit and sending a pull request
> with all fixes?
The following changes since commit 0b86a4e34d885e734a4c4e46293376f3f1c639eb:
Ingo Molnar (1):
Merge branch 'core/header-fixes' of git://git.kernel.org/.../jaswinder/linux-2.6-tip into core/header-fixes
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git core/header-fixes
Jaswinder Singh Rajput (2):
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
make linux/types.h as assembly safe
arch/ia64/include/asm/fpu.h | 2 --
include/linux/types.h | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
Complete diff:
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
index b6395ad..0c26157 100644
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
@@ -6,8 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-#include <linux/types.h>
-
/* floating point status register: */
#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */
diff --git a/include/linux/types.h b/include/linux/types.h
index 712ca53..c30973a 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,7 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
+#ifndef __ASSEMBLY__
#ifdef __KERNEL__
#define DECLARE_BITMAP(name,bits) \
@@ -212,5 +213,5 @@ struct ustat {
};
#endif /* __KERNEL__ */
-
+#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */
^ permalink raw reply related
* Re: [linux-next][PATCH] revert headers_check fix: ia64, fpu.h
From: Russell King - ARM Linux @ 2009-02-06 15:33 UTC (permalink / raw)
To: Jaswinder Singh Rajput
Cc: Ingo Molnar, KOSAKI Motohiro, Jaswinder Singh Rajput,
Linus Torvalds, Sam Ravnborg, Andrew Morton, hskinnemoen,
cooloney, tony.luck, ralf, dhowells, matthew, chris, LKML,
linux-next, linux-ia64
In-Reply-To: <1233934141.3209.20.camel@localhost.localdomain>
On Fri, Feb 06, 2009 at 08:59:01PM +0530, Jaswinder Singh Rajput wrote:
> On Fri, 2009-02-06 at 15:55 +0100, Ingo Molnar wrote:
> > * KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> wrote:
> >
> > > > > Index: b/arch/ia64/include/asm/fpu.h
> > > > > ===================================================================
> > > > > --- a/arch/ia64/include/asm/fpu.h
> > > > > +++ b/arch/ia64/include/asm/fpu.h
> > > > > @@ -6,7 +6,7 @@
> > > > > * David Mosberger-Tang <davidm@hpl.hp.com>
> > > > > */
> > > > >
> > > > > -#include <linux/types.h>
> > > > > +#include <asm/types.h>
> > > > >
> > > >
> > > > No , we do not even need asm/types.h
> > > >
> > > > Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
> > > > for arch/ia64/include/asm/fpu.h
> > > >
> > > > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> > >
> > > ok. I confirmed.
> > > Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> > > Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> >
> > Thanks.
> >
> > Jaswinder, mind adding these tags to the commit and sending a pull request
> > with all fixes?
>
> The following changes since commit 0b86a4e34d885e734a4c4e46293376f3f1c639eb:
> Ingo Molnar (1):
> Merge branch 'core/header-fixes' of git://git.kernel.org/.../jaswinder/linux-2.6-tip into core/header-fixes
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git core/header-fixes
>
> Jaswinder Singh Rajput (2):
> Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
> make linux/types.h as assembly safe
I continue to disagree with the need for the second patch.
^ permalink raw reply
* Re: next-20090206: kernel BUG at mm/slub.c:1132
From: Chris Mason @ 2009-02-06 15:37 UTC (permalink / raw)
To: Alexander Beregalov
Cc: linux-kernel, linux-mm, linux-btrfs, linux-next@vger.kernel.org
In-Reply-To: <a4423d670902060710m4919f6d6p1ffae13859c891be@mail.gmail.com>
On Fri, 2009-02-06 at 18:10 +0300, Alexander Beregalov wrote:
> Hi
>
> I run dbench on btrfs, which is on file on xfs
>
> btrfs: disabling barriers on dev /dev/loop/0
> ------------[ cut here ]------------
> kernel BUG at mm/slub.c:1132!
> invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
> last sysfs file: /sys/kernel/uevent_seqnum
Btrfs hammers on slab caches quite a lot, can you reproduce this without
loop or without btrfs?
-chris
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [PATCH] revert headers_check fix: ia64, fpu.h
From: Ingo Molnar @ 2009-02-06 15:45 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Jaswinder Singh Rajput, KOSAKI Motohiro, Jaswinder Singh Rajput,
Linus Torvalds, Sam Ravnborg, Andrew Morton, hskinnemoen,
cooloney, tony.luck, ralf, dhowells, matthew, chris, LKML,
linux-next, linux-ia64
In-Reply-To: <20090206153315.GD13758@n2100.arm.linux.org.uk>
* Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
> On Fri, Feb 06, 2009 at 08:59:01PM +0530, Jaswinder Singh Rajput wrote:
> > On Fri, 2009-02-06 at 15:55 +0100, Ingo Molnar wrote:
> > > * KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> wrote:
> > >
> > > > > > Index: b/arch/ia64/include/asm/fpu.h
> > > > > > ===================================================================
> > > > > > --- a/arch/ia64/include/asm/fpu.h
> > > > > > +++ b/arch/ia64/include/asm/fpu.h
> > > > > > @@ -6,7 +6,7 @@
> > > > > > * David Mosberger-Tang <davidm@hpl.hp.com>
> > > > > > */
> > > > > >
> > > > > > -#include <linux/types.h>
> > > > > > +#include <asm/types.h>
> > > > > >
> > > > >
> > > > > No , we do not even need asm/types.h
> > > > >
> > > > > Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
> > > > > for arch/ia64/include/asm/fpu.h
> > > > >
> > > > > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> > > >
> > > > ok. I confirmed.
> > > > Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> > > > Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> > >
> > > Thanks.
> > >
> > > Jaswinder, mind adding these tags to the commit and sending a pull request
> > > with all fixes?
> >
> > The following changes since commit 0b86a4e34d885e734a4c4e46293376f3f1c639eb:
> > Ingo Molnar (1):
> > Merge branch 'core/header-fixes' of git://git.kernel.org/.../jaswinder/linux-2.6-tip into core/header-fixes
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git core/header-fixes
> >
> > Jaswinder Singh Rajput (2):
> > Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
> > make linux/types.h as assembly safe
>
> I continue to disagree with the need for the second patch.
But have not replied to my mail about that so far.
Why is it wrong to make types.h an assembly-invariant? It is positively
helpful for mixed-mode headers and has no downsides whatsoever.
Ingo
^ 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