* Re: Re: next-20081125: crypto hard disk gets unaccessable
From: Milan Broz @ 2008-12-01 0:16 UTC (permalink / raw)
To: Nico -telmich- Schottelius
Cc: Christophe Saout, LKML, device-mapper development, linux-next,
linux-crypto, Herbert, Xu
In-Reply-To: <20081129192939.925275f0.akpm@linux-foundation.org>
Andrew Morton wrote:
> (cc's added)
>
>> After about four suspend & resume operations in the midst of editing
>> a file, the system beeped twice and issued this error:
Did this work before? If so, please can you provide version where
it works?
It is suspend to encrypted swap?
There should not be any recent change in dm-crypt related to this path,
so I expect it is some bug related to suspend/resume in combination with
running crypto - like corruption of some memory caused during suspend...
> [lots of snippage]
>> [69186.618357] RIP: 0010:[<ffffffff8031f246>] [<ffffffff8031f246>] crypto_xor+0x7/0x48
> [69186.618468] [<ffffffffa027226a>] ? crypto_cbc_encrypt+0xfa/0x15a [cbc]
> [69186.618481] [<ffffffffa0285705>] ? aes_encrypt+0x0/0x7 [aes_x86_64]
> [69186.618494] [<ffffffffa020667d>] ? async_encrypt+0x35/0x3a [crypto_blkcipher]
> [69186.618509] [<ffffffffa0269a6f>] ? crypt_convert+0x1d2/0x253 [dm_crypt]
> [69186.618522] [<ffffffffa0269ed6>] ? kcryptd_crypt+0x3e6/0x407 [dm_crypt]
> [69186.618533] [<ffffffffa0269af0>] ? kcryptd_crypt+0x0/0x407 [dm_crypt]
I assume that crypto run here synchronously (not through asynchronous completion callback).
Herbert - is my guess ok? (The asynchronous handling in dm-crypt was the only part changed recently.)
(And I think that except crypto hw nobody uses asynchronous mode yet by default.)
Milan
--
mbroz@redhat.com
^ permalink raw reply
* linux-next: manual merge of the driver-core tree
From: Stephen Rothwell @ 2008-12-01 0:15 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, Catalin Marinas, Russell King, Kay Sievers,
David Woodhouse
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/mtd/maps/integrator-flash.c between commit
ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
multiple blocks of flash") from the arm tree and commit
0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
bus_id with dev_name(), dev_set_name()") from the driver-core tree.
I fixed it up (see below). Maybe you, Russell and David Woodhouse could
sort out who should coordinate these updates.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/mtd/maps/integrator-flash.c
index 5a773a3,d2ec262..0000000
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@@ -112,112 -121,7 +112,112 @@@ static int armflash_subdev_probe(struc
goto no_device;
}
- info->mtd->owner = THIS_MODULE;
+ subdev->mtd->owner = THIS_MODULE;
+
+ /* Successful? */
+ if (err == 0)
+ return err;
+
+ if (subdev->mtd)
+ map_destroy(subdev->mtd);
+ no_device:
+ iounmap(base);
+ no_mem:
+ release_mem_region(res->start, size);
+ out:
+ return err;
+}
+
+static void armflash_subdev_remove(struct armflash_subdev_info *subdev)
+{
+ if (subdev->mtd)
+ map_destroy(subdev->mtd);
+ if (subdev->map.virt)
+ iounmap(subdev->map.virt);
+ release_mem_region(subdev->map.phys, subdev->map.size);
+}
+
+static int armflash_probe(struct platform_device *dev)
+{
+ struct flash_platform_data *plat = dev->dev.platform_data;
+ unsigned int size;
+ struct armflash_info *info;
+ int i, nr, err;
+
+ /* Count the number of devices */
+ for (nr = 0; ; nr++)
+ if (!platform_get_resource(dev, IORESOURCE_MEM, nr))
+ break;
+ if (nr == 0) {
+ err = -ENODEV;
+ goto out;
+ }
+
+ size = sizeof(struct armflash_info) +
+ sizeof(struct armflash_subdev_info) * nr;
+ info = kzalloc(size, GFP_KERNEL);
+ if (!info) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+ if (plat && plat->init) {
+ err = plat->init();
+ if (err)
+ goto no_resource;
+ }
+
+ for (i = 0; i < nr; i++) {
+ struct armflash_subdev_info *subdev = &info->subdev[i];
+ struct resource *res;
+
+ res = platform_get_resource(dev, IORESOURCE_MEM, i);
+ if (!res)
+ break;
+
+ if (nr == 1)
+ /* No MTD concatenation, just use the default name */
+ snprintf(subdev->name, SUBDEV_NAME_SIZE, "%s",
- dev->dev.bus_id);
++ dev_name(&dev->dev));
+ else
+ snprintf(subdev->name, SUBDEV_NAME_SIZE, "%s-%d",
- dev->dev.bus_id, i);
++ dev_name(&dev->dev), i);
+ subdev->plat = plat;
+
+ err = armflash_subdev_probe(subdev, res);
+ if (err)
+ break;
+ }
+ info->nr_subdev = i;
+
+ if (err)
+ goto subdev_err;
+
+ if (info->nr_subdev == 1)
+ info->mtd = info->subdev[0].mtd;
+ else if (info->nr_subdev > 1) {
+#ifdef CONFIG_MTD_CONCAT
+ struct mtd_info *cdev[info->nr_subdev];
+
+ /*
+ * We detected multiple devices. Concatenate them together.
+ */
+ for (i = 0; i < info->nr_subdev; i++)
+ cdev[i] = info->subdev[i].mtd;
+
+ info->mtd = mtd_concat_create(cdev, info->nr_subdev,
- dev->dev.bus_id);
++ dev_name(&dev->dev));
+ if (info->mtd == NULL)
+ err = -ENXIO;
+#else
+ printk(KERN_ERR "armflash: multiple devices found but "
+ "MTD concat support disabled.\n");
+ err = -ENXIO;
+#endif
+ }
+
+ if (err < 0)
+ goto cleanup;
err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0);
if (err > 0) {
^ permalink raw reply
* Re: next-2008-11-28 : can't mount UDF DVD
From: Marcin Slusarz @ 2008-12-01 0:18 UTC (permalink / raw)
To: Laurent Riffard; +Cc: Stephen Rothwell, Jan Kara, linux-next, LKML
In-Reply-To: <49332545.5020604@free.fr>
On Mon, Dec 01, 2008 at 12:44:05AM +0100, Laurent Riffard wrote:
> Hi,
>
> With next-2008-11-28, I was unable to mount an UDF-formatted DVD-RW:
>
> ~$ mount -oro -t udf /dev/sr0 /media/cdrom/
> mount: Not a directory
>
> There was no problem with 2.6.28-rc6.
>
> I made a bisection:
>
> 33284bdf40f88160a154202510b27d983138c805 is first bad commit
> commit 33284bdf40f88160a154202510b27d983138c805
> Author: Marcin Slusarz <marcin.slusarz@gmail.com>
> Date: Sun Nov 16 20:52:19 2008 +0100
>
> udf: implement mode and dmode mounting options
>
> "dmode" allows overriding permissions of directories and
> "mode" allows overriding permissions of files.
>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> Cc: Jan Kara <jack@suse.cz>
> Signed-off-by: Jan Kara <jack@suse.cz>
>
>
> Indeed, with this commit, I *must* use the dmode option to mount my DVD:
That's not intended behaviour... ;)
> ~$ sudo mount -oro,dmode=0755 -t udf /dev/sr0 /media/cdrom/
> ~$ grep /media/cdrom /proc/mounts
> /dev/scd0 /media/cdrom udf ro,mode=177777,dmode=755,utf8 0 0
^^^^^^
funny (it's 65535 / (u16)-1)
> ~$ ls -la /media/cdrom/
> total 46
> drwxr-xr-x 5 root root 344 Dec 24 2007 .
> drwxr-xr-x 12 root root 4096 Dec 1 00:17 ..
> drwxr-xr-x 2 laurent laurent 7112 Nov 30 20:14 flexbackup
> drwxr-xr-x 2 root root 40 Nov 20 2005 lost+found
> drwxr-xr-x 10 laurent laurent 4548 Nov 25 2005 patches
> ~$ ls -la /media/cdrom/flexbackup/
> total 4307946
> drwxr-xr-x 2 laurent laurent 7112 Nov 30 20:14 .
> drwxr-xr-x 5 root root 344 Dec 24 2007 ..
> ?rwsrwsrwt 1 laurent laurent 44 Oct 1 2006 00-index-key
> ...
>
> Althought I was able to mount it with no special option on 2.6.28-rc6:
>
> ~$ sudo mount -oro -t udf /dev/sr0 /media/cdrom/
> ~$ grep /media/cdrom /proc/mounts
> /dev/scd0 /media/cdrom udf ro,utf8 0 0
> ~$ ls -la /media/cdrom/
> total 46
> drwxrwxrwx 5 root root 344 2007-12-24 18:09 .
> drwxr-xr-x 12 root root 4096 2008-12-01 00:22 ..
> drwxr-x--- 2 laurent laurent 7112 2008-11-30 20:14 flexbackup
> drwxr-xr-x 2 root root 40 2005-11-20 23:37 lost+found
> drwxr-x--- 10 laurent laurent 4548 2005-11-25 18:18 patches
> ~$ ls -la /media/cdrom/flexbackup/
> total 4307946
> drwxr-x--- 2 laurent laurent 7112 2008-11-30 20:14 .
> drwxrwxrwx 5 root root 344 2007-12-24 18:09 ..
> -rw-r----- 1 laurent laurent 44 2006-10-01 15:36 00-index-key
> ...
>
> ~~
> laurent
Can you check whether attached patch fixes it?
What architecture are you testing on?
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 6612a27..9eeb726 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1222,10 +1222,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
iinfo->i_lenExtents = inode->i_size;
if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY &&
- sbi->s_fmode != -1)
+ sbi->s_fmode != (mode_t)-1)
inode->i_mode = sbi->s_fmode;
else if (fe->icbTag.fileType == ICBTAG_FILE_TYPE_DIRECTORY &&
- sbi->s_dmode != -1)
+ sbi->s_dmode != (mode_t)-1)
inode->i_mode = sbi->s_dmode;
else
inode->i_mode = udf_convert_permissions(fe);
diff --git a/fs/udf/super.c b/fs/udf/super.c
index e5d121d..af8a771 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -284,9 +284,9 @@ static int udf_show_options(struct seq_file *seq, struct vfsmount *mnt)
seq_printf(seq, ",gid=%u", sbi->s_gid);
if (sbi->s_umask != 0)
seq_printf(seq, ",umask=%o", sbi->s_umask);
- if (sbi->s_fmode != -1)
+ if (sbi->s_fmode != (mode_t)-1)
seq_printf(seq, ",mode=%o", sbi->s_fmode);
- if (sbi->s_dmode != -1)
+ if (sbi->s_dmode != (mode_t)-1)
seq_printf(seq, ",dmode=%o", sbi->s_dmode);
if (UDF_QUERY_FLAG(sb, UDF_FLAG_SESSION_SET))
seq_printf(seq, ",session=%u", sbi->s_session);
^ permalink raw reply related
* linux-next: manual merge of the ftrace tree
From: Stephen Rothwell @ 2008-12-01 0:37 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Lai Jiangshan, Steven Rostedt
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/ring_buffer.c between commit
4f5a7f40ddbae98569acbb99118a98570315579c ("ftrace: prevent recursion")
from Linus' tree and commit 182e9f5f704ed6b9175142fe8da33c9ce0c52b52
("ftrace: insert in the ftrace_preempt_disable()/enable() functions")
from the ftrace tree.
I am pretty sure that the latter supercedes the former, so I used that
version. Please fix this conflict up in the ftrace 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: manual merge of the acpi tree
From: Stephen Rothwell @ 2008-12-01 2:10 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
drivers/acpi/blacklist.c between commit
a6e0887f21bbab337ee32d9c0a84d7c0b6e9141b ("ACPI: delete OSI(Linux) DMI
dmesg spam") from Linus' tree and commit
865596071bb89ec67a44b0ef2da172e0e733ce16 ("ACPI: delete OSI(Linux) DMI
dmesg spam") from the acpi tree.
The former had a slightly later commit time, so I used that. Please fix
up the conflict in the acpi tree.
--
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 acpi tree
From: Len Brown @ 2008-12-01 2:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20081201131029.58f6d00c.sfr@canb.auug.org.au>
On Mon, 1 Dec 2008, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/acpi/blacklist.c between commit
> a6e0887f21bbab337ee32d9c0a84d7c0b6e9141b ("ACPI: delete OSI(Linux) DMI
> dmesg spam") from Linus' tree and commit
> 865596071bb89ec67a44b0ef2da172e0e733ce16 ("ACPI: delete OSI(Linux) DMI
> dmesg spam") from the acpi tree.
>
> The former had a slightly later commit time, so I used that. Please fix
> up the conflict in the acpi tree.
Hi Stephen,
Like linux-next, pulling the acpi tree into old copies of itself
doesn't work.
This is because I occasionally have to revise various patches and generate
"clean history" for the upstream pull into Linus' tree.
Also, I occasionally re-base branches within the tree up to
newer baselines so that they are easier to test vs upstream.
So if you pull the acpi tree into a copy of Linus' tree
then this type of conflict will go away.
thanks,
-Len
^ permalink raw reply
* Re: linux-next: manual merge of the acpi tree
From: Stephen Rothwell @ 2008-12-01 3:02 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next
In-Reply-To: <alpine.LFD.2.00.0811302150290.3314@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi Len,
On Sun, 30 Nov 2008 21:55:38 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> So if you pull the acpi tree into a copy of Linus' tree
> then this type of conflict will go away.
And if you pull Linus' tree into the acpi tree the conflict will go away
as well ... but you (who understand the intention of the code) get to fix
it up rather than me (who is guessing).
--
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 net tree
From: Stephen Rothwell @ 2008-12-01 3:16 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Al Viro, Alexander Duyck
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a conflict in drivers/net/ixgbe/ixgbe_main.c between commit 43ced651d1272ced02ed5f1c2abc79e3354187f6 ("ixgbe section fixes") from Linus' tree and commit ixgbe_init_interrupt_scheme ("ixgbe: this patch adds support for DCB to the kernel and ixgbe driver") from the net tree.
I used the latter version (ixgbe_init_interrupt_scheme() is now not
static and both patches removed the __devinit annotation). This could be
fixed up by merging Linus' tree into the net tree.
--
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 net tree
From: Stephen Rothwell @ 2008-12-01 3:26 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Al Viro, Mike Frysinger, Jeff Garzik
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/smc91x.c between commit
f57628d76bd201a444ca822f3622522a44acbf60 ("section errors in
smc911x/smc91x") from Linus' tree and commit smc_drv_probe ("smc91x: add
__init markings to smc_drv_probe()") from the net tree.
The former changed smc_drv_probe() to __devinit while the latter to
__init. I used the latter and it can be fixed up in your tree.
I do wonder why the former change didn't go through Jeff's tree ...
--
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 acpi tree
From: Len Brown @ 2008-12-01 4:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20081201140233.cf65c890.sfr@canb.auug.org.au>
> And if you pull Linus' tree into the acpi tree the conflict will go away
> as well ... but you (who understand the intention of the code) get to fix
> it up rather than me (who is guessing).
Your guess was correct -- the patch with the later commit time
was the correct one to keep.
This was my pilot error. I updated the patch in my release tree
and so you got the updated patch via Linus. But I failed to update
my test tree, so you got the old patch from my test tree.
I've just re-constituted my test branch, so the old patch is gone,
and with it this conflict.
thanks for pointing this out,
-Len
^ permalink raw reply
* Re: drivers/x86 (Was: Re: linux-next: Tree for November 28 (misc/tc1100))
From: Len Brown @ 2008-12-01 4:29 UTC (permalink / raw)
To: Ingo Molnar
Cc: Stephen Rothwell, Len Brown, linux-next, LKML, Randy Dunlap, x86
In-Reply-To: <20081129093414.GB26691@elte.hu>
On Sat, 29 Nov 2008, Ingo Molnar wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Len,
> >
> > On Fri, 28 Nov 2008 09:55:08 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > >
> > > make[2]: *** No rule to make target `drivers/misc/tc1100-wmi.o', needed by `drivers/misc/built-in.o'.
> > >
> > > on allmodconfig & allyesconfig for i386.
> > >
> > > On, moved to drivers/x86/. Someone needs to clean up drivers/misc/Makefile.
> >
> > Just wondering where the move to drivers/x86 was discussed, (reviewed
> > and tested) and why the change is in the acpi tree and not the x86
> > tree?
>
> it will all conflict with pending bits in the x86 tree, so i'd prefer if
> Len did this atomically after 2.6.29-rc1, without it having this
> long-term breakage effect.
Is linux-next running into a conflict between x86 and the acpi
tree today?
thanks,
-Len
^ permalink raw reply
* Re: [RFC PATCH] x86: create drivers/x86/ from drivers/misc/
From: Len Brown @ 2008-12-01 4:35 UTC (permalink / raw)
To: Henrique de Moraes Holschuh
Cc: Sam Ravnborg, Stephen Rothwell, Len Brown, linux-next, LKML,
Randy Dunlap, x86, linux-acpi
In-Reply-To: <20081129001647.GA8699@khazad-dum.debian.net>
On Fri, 28 Nov 2008, Henrique de Moraes Holschuh wrote:
> On Fri, 28 Nov 2008, Len Brown wrote:
> > > > Move x86 platform specific drivers from drivers/misc/
> > > > to a new home under drivers/x86/.
> [...]
> > > We already have 81 one directory entries under drivers/
> > > and with patch you open up for an additional
> > > directory for each arch - not elegant.
> >
> > I followed the example of drivers/s390/,
> > per Linus' suggestion.
> >
> > The other place that seemed to suggest itself was
> > arch/x86/drivers/, as we already have:
> >
> > arch/um/drivers/
> > arch/sh/drivers/
> > arch/cris/*/drivers/
>
> IMHO, from a purely "tree organization" point of view, it would be best if
> arch-specific platform drivers were under drivers/platform/<arch>/. And
> arch/ be left for the core arch-specific stuff.
>
> Whether that would work well, when arch maintenance factors are taken into
> account, I don't know.
Each of the drivers has a primary maintainer --
though some of them jare more active than others...
And I'll continue to be available to help them where I can.
> > > As it is today (before this patch) the directories unider
> > > drivers/ said what the drivers was used for - which is logical.
> > >
> > > But with this new arch specific directory it is no longer obvious
> > > is a driver should be located under say drivers/net/* or
> > > drivers/arm/* in case it is a arm specific driver.
>
> drivers/platform/<arch> would help in that regard, I think.
I agree.
drivers/platform/x86/ seems to be a better home than drivers/x86/
for this bunch. I'll update the patch to do this.
The other arch's can follow later if they choose.
thanks,
-Len
^ permalink raw reply
* Re: linux-next: manual merge of the acpi tree
From: Stephen Rothwell @ 2008-12-01 4:37 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next
In-Reply-To: <alpine.LFD.2.00.0811302246100.3314@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
Hi Len,
On Sun, 30 Nov 2008 23:11:50 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> Your guess was correct -- the patch with the later commit time
> was the correct one to keep.
>
> This was my pilot error. I updated the patch in my release tree
> and so you got the updated patch via Linus. But I failed to update
> my test tree, so you got the old patch from my test tree.
>
> I've just re-constituted my test branch, so the old patch is gone,
> and with it this conflict.
OK, 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
* Re: next-2008-11-28: bfin vs cpumask fixlet
From: Rusty Russell @ 2008-12-01 4:47 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20081128151755.GA27660@x200.localdomain>
On Saturday 29 November 2008 01:47:55 Alexey Dobriyan wrote:
> --- a/arch/blackfin/kernel/time-ts.c
> +++ b/arch/blackfin/kernel/time-ts.c
> @@ -162,7 +162,6 @@ static struct clock_event_device clockevent_bfin = {
> .name = "bfin_core_timer",
> .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
> .shift = 32,
> - .cpumask = CPU_MASK_CPU0,
Thanks Alexey, applied.
I grepped harder, and this seems to be the last one.
Cheers,
Rusty.
^ permalink raw reply
* Re: [RFC PATCH] x86: create drivers/x86/ from drivers/misc/
From: Randy Dunlap @ 2008-12-01 4:49 UTC (permalink / raw)
To: Len Brown
Cc: Sam Ravnborg, Stephen Rothwell, Len Brown, linux-next, LKML,
Randy Dunlap, x86, linux-acpi
In-Reply-To: <alpine.LFD.2.00.0811281819070.24773@localhost.localdomain>
Len Brown wrote:
>
>> You move 12 files but delete 11 lines.
>
> obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
>
> was left behind by mistake.
Yes, that caused the build error that was the original posting
for this thread.
~Randy
^ permalink raw reply
* Re: Re: next-20081125: crypto hard disk gets unaccessable
From: Herbert Xu @ 2008-12-01 4:57 UTC (permalink / raw)
To: Milan Broz
Cc: Christophe Saout, Nico -telmich- Schottelius, LKML,
device-mapper development, linux-next, linux-crypto, Herbert
In-Reply-To: <49332CC6.4080606@redhat.com>
On Mon, Dec 01, 2008 at 01:16:06AM +0100, Milan Broz wrote:
>
> > [69186.618468] [<ffffffffa027226a>] ? crypto_cbc_encrypt+0xfa/0x15a [cbc]
> > [69186.618481] [<ffffffffa0285705>] ? aes_encrypt+0x0/0x7 [aes_x86_64]
> > [69186.618494] [<ffffffffa020667d>] ? async_encrypt+0x35/0x3a [crypto_blkcipher]
> > [69186.618509] [<ffffffffa0269a6f>] ? crypt_convert+0x1d2/0x253 [dm_crypt]
> > [69186.618522] [<ffffffffa0269ed6>] ? kcryptd_crypt+0x3e6/0x407 [dm_crypt]
> > [69186.618533] [<ffffffffa0269af0>] ? kcryptd_crypt+0x0/0x407 [dm_crypt]
>
> I assume that crypto run here synchronously (not through asynchronous completion callback).
>
> Herbert - is my guess ok? (The asynchronous handling in dm-crypt was the only part changed recently.)
> (And I think that except crypto hw nobody uses asynchronous mode yet by default.)
Yes that's definitely synchronous.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: [RFC PATCH] x86: create drivers/x86/ from drivers/misc/
From: Len Brown @ 2008-12-01 5:00 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Stephen Rothwell, Len Brown, linux-next, LKML, Randy Dunlap, x86,
linux-acpi
In-Reply-To: <20081129073816.GB8351@uranus.ravnborg.org>
On Sat, 29 Nov 2008, Sam Ravnborg wrote:
> Comments below in case we stick to this drivers/x86 thing...
now the "drivers/platform/x86/ thing"
aka the "get rid of drivers/misc/ thing":-)
> > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> > index 93224b5..b89db1e 100644
> > --- a/arch/x86/Kconfig
> > +++ b/arch/x86/Kconfig
> > @@ -1904,6 +1904,8 @@ source "drivers/Kconfig"
> >
> > source "drivers/firmware/Kconfig"
> >
> > +source "drivers/x86/Kconfig"
> > +
> > source "fs/Kconfig"
>
> Any chance we can have this in drivers/Kconfig?
>
> Just wrap all of the file in an
>
> if X86
> .....
> endif
>
> So we keep all the drivers/ stuff in one Kconfig file and
> not spread all over.
grep 'source "drivers"' arch/x86/Kconfig
source "drivers/acpi/Kconfig"
source "drivers/cpuidle/Kconfig"
source "drivers/idle/Kconfig"
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
source "drivers/eisa/Kconfig"
source "drivers/mca/Kconfig"
source "drivers/pcmcia/Kconfig"
source "drivers/pci/hotplug/Kconfig"
source "drivers/Kconfig"
source "drivers/firmware/Kconfig"
source "drivers/x86/Kconfig"
Are the lines above a good example, a bad example,
or did I miss a nuance of the grand Kconfig design?
I really don't care one way or another, but there
seem to be examples of both ways...
> > diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> > index d1a47ad..a750519 100644
> > --- a/arch/x86/Makefile
> > +++ b/arch/x86/Makefile
> > @@ -171,6 +171,9 @@ ifeq ($(CONFIG_X86_32),y)
> > drivers-$(CONFIG_FB) += arch/x86/video/
> > endif
> >
> > +# x86 platform-specific drivers
> > +drivers-y += drivers/x86/
> > +
>
> Can this be included in drivers/Makefile like this:
>
> obj-$(CONFIG_X86) += x86/
>
> Notice that parisc already do the same. (Yes they have
> a drivers/parisc dir).
>
> We shall try to visit our tree in natural order when we build
> and such a rule breaks this.
> Also it is good to keep drivers/ stuff in one place.
sure, that sounds reasonable.
> > +++ b/drivers/x86/Kconfig
> > @@ -0,0 +1,290 @@
> > +#
> > +# X86 Platform Specific Drivers
> > +#
> > +
> > +menuconfig X86_PLATFORM_DEVICES
> > + bool "X86 Platform devices"
> > + default y
> > + ---help---
> > + Say Y here to get to see options for device drivers for various
> > + x86 platforms, including vendor-specific laptop extension drivers.
> > + This option alone does not add any kernel code.
> > +
> > + If you say N, all options in this submenu will be skipped and disabled.
> > +
> > +if X86_PLATFORM_DEVICES
> > +
> > +config ACER_WMI
> > + tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
> spaces => tab
>
> > +config ASUS_LAPTOP
> > + tristate "Asus Laptop Extras (EXPERIMENTAL)"
> > + depends on ACPI
> spaces => tab
>
> > +config FUJITSU_LAPTOP
> > + tristate "Fujitsu Laptop Extras"
> > + depends on ACPI
> > + depends on INPUT
> > + depends on BACKLIGHT_CLASS_DEVICE
> > + ---help---
> spaces => tab
>
> > +config HP_WMI
> > + tristate "HP WMI extras"
> > + depends on ACPI_WMI
> > + depends on INPUT
> > + depends on RFKILL
> > + help
> > + Say Y here if you want to support WMI-based hotkeys on HP laptops and
> spaces => tab
>
> > + to read data from WMI such as docking or ambient light sensor state.
> > +
> > + To compile this driver as a module, choose M here: the module will
> > + be called hp-wmi.
> > +
> > +config MSI_LAPTOP
> > + tristate "MSI Laptop Extras"
> > + depends on ACPI
> > + depends on BACKLIGHT_CLASS_DEVICE
> > + ---help---
> spaces => tab
>
> > diff --git a/drivers/x86/Makefile b/drivers/x86/Makefile
> > new file mode 100644
> > index 0000000..4f14f28
> > --- /dev/null
> > +++ b/drivers/x86/Makefile
> > @@ -0,0 +1,17 @@
> > +#
> > +# x86 Platform-Specific Drivers
> > +#
> > +obj- := x86.o # Dummy rule to force built-in.o to be made
>
> This is not needed. I can see divers/misc uses the same
> but it is bogus.
Yes, all of this text came from the existing drivers/misc/
I'll fix it.
thanks,
-Len
^ permalink raw reply
* Re: linux-next: sparc tree build failure
From: Sam Ravnborg @ 2008-12-01 5:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, linux-next
In-Reply-To: <20081201104639.5080f12e.sfr@canb.auug.org.au>
On Mon, Dec 01, 2008 at 10:46:39AM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> GEN /scratch/sfr/powerpc_ppc64_defconfig/Makefile
> ***
> *** Can't find default configuration "arch/sparc/configs/ppc64_defconfig"!
> ***
>
> Caused by commit 9cdcf85e1bf5dca97c1304292810041af2fcbd42 ("Subject:
> [PATCH 08/10] sparc,sparc64: unify Makefile") which seems to arbitrarily
> set SRCARCH in the top level make file to sparc!
Crap - missed an if/endif
Fix is simple:
diff --git a/Makefile b/Makefile
index 0043224..45f4300 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,9 @@ ifeq ($(ARCH),x86_64)
endif
# Additional ARCH settings for sparc
+ifeq ($(ARCH),sparc64)
SRCARCH := sparc
+endif
# Where to locate arch specific headers
hdr-arch := $(SRCARCH)
>
> (One way to take over the world, I guess :-))
Reminds me about Pinky & Brain - we almost suceeded!
Sam
^ permalink raw reply related
* Re: [RFC PATCH] x86: create drivers/x86/ from drivers/misc/
From: Sam Ravnborg @ 2008-12-01 5:54 UTC (permalink / raw)
To: Len Brown
Cc: Stephen Rothwell, Len Brown, linux-next, LKML, Randy Dunlap, x86,
linux-acpi
In-Reply-To: <alpine.LFD.2.00.0811302338450.3314@localhost.localdomain>
On Mon, Dec 01, 2008 at 12:00:04AM -0500, Len Brown wrote:
> >
> > Any chance we can have this in drivers/Kconfig?
> >
> > Just wrap all of the file in an
> >
> > if X86
> > .....
> > endif
> >
> > So we keep all the drivers/ stuff in one Kconfig file and
> > not spread all over.
>
> grep 'source "drivers"' arch/x86/Kconfig
>
> source "drivers/acpi/Kconfig"
> source "drivers/cpuidle/Kconfig"
> source "drivers/idle/Kconfig"
> source "drivers/pci/pcie/Kconfig"
> source "drivers/pci/Kconfig"
> source "drivers/eisa/Kconfig"
> source "drivers/mca/Kconfig"
> source "drivers/pcmcia/Kconfig"
> source "drivers/pci/hotplug/Kconfig"
> source "drivers/Kconfig"
> source "drivers/firmware/Kconfig"
> source "drivers/x86/Kconfig"
>
> Are the lines above a good example, a bad example,
> or did I miss a nuance of the grand Kconfig design?
Unfortunately a typical example but if you look
closer most of the above is bus stuff, not driver stuff.
This is not the easist part to deal with
as there are > 10 arch to synchronize.
Sam
^ permalink raw reply
* [RFC PATCH v2] create drivers/platform/x86/ from drivers/misc/
From: Len Brown @ 2008-12-01 6:02 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Stephen Rothwell, Len Brown, linux-next, LKML, Randy Dunlap, x86,
linux-acpi
In-Reply-To: <20081129073816.GB8351@uranus.ravnborg.org>
Sam, Henrique,
I've responded to your feedback in v2, which follows.
Ingo,
this version does not touch arch/x86/
thanks,
-Len
^ permalink raw reply
* [PATCH 1/2] drivers/misc/Makefile, Kconfig: cleanup
From: Len Brown @ 2008-12-01 6:03 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Stephen Rothwell, Len Brown, linux-next, LKML, Randy Dunlap, x86,
linux-acpi
In-Reply-To: <alpine.LFD.2.00.0812010053100.3314@localhost.localdomain>
From: Len Brown <len.brown@intel.com>
tabs->space and delete unnecessary dummy build-in.o rule.
Suggested-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/misc/Kconfig | 42 +++++++++++++++++++++---------------------
drivers/misc/Makefile | 3 ---
2 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fee7304..dcf6169 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -120,7 +120,7 @@ config TIFM_CORE
cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD
Interface support (MMC_TIFM_SD)'.
- To compile this driver as a module, choose M here: the module will
+ To compile this driver as a module, choose M here: the module will
be called tifm_core.
config TIFM_7XX1
@@ -133,11 +133,11 @@ config TIFM_7XX1
To make actual use of the device, you will have to select some
flash card format drivers, as outlined in the TIFM_CORE Help.
- To compile this driver as a module, choose M here: the module will
+ To compile this driver as a module, choose M here: the module will
be called tifm_7xx1.
config ACER_WMI
- tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
+ tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
depends on X86
depends on EXPERIMENTAL
depends on ACPI
@@ -159,14 +159,14 @@ config ACER_WMI
here.
config ASUS_LAPTOP
- tristate "Asus Laptop Extras (EXPERIMENTAL)"
- depends on X86
- depends on ACPI
+ tristate "Asus Laptop Extras (EXPERIMENTAL)"
+ depends on X86
+ depends on ACPI
depends on EXPERIMENTAL && !ACPI_ASUS
depends on LEDS_CLASS
depends on NEW_LEDS
depends on BACKLIGHT_CLASS_DEVICE
- ---help---
+ ---help---
This is the new Linux driver for Asus laptops. It may also support some
MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
standard ACPI events that go through /proc/acpi/events. It also adds
@@ -179,12 +179,12 @@ config ASUS_LAPTOP
If you have an ACPI-compatible ASUS laptop, say Y or M here.
config FUJITSU_LAPTOP
- tristate "Fujitsu Laptop Extras"
- depends on X86
- depends on ACPI
+ tristate "Fujitsu Laptop Extras"
+ depends on X86
+ depends on ACPI
depends on INPUT
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
This is a driver for laptops built by Fujitsu:
* P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
@@ -221,11 +221,11 @@ config HP_WMI
depends on INPUT
depends on RFKILL
help
- Say Y here if you want to support WMI-based hotkeys on HP laptops and
+ Say Y here if you want to support WMI-based hotkeys on HP laptops and
to read data from WMI such as docking or ambient light sensor state.
- To compile this driver as a module, choose M here: the module will
- be called hp-wmi.
+ To compile this driver as a module, choose M here: the module will
+ be called hp-wmi.
config ICS932S401
tristate "Integrated Circuits ICS932S401"
@@ -238,11 +238,11 @@ config ICS932S401
will be called ics932s401.
config MSI_LAPTOP
- tristate "MSI Laptop Extras"
- depends on X86
- depends on ACPI
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
+ tristate "MSI Laptop Extras"
+ depends on X86
+ depends on ACPI
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
This is a driver for laptops built by MSI (MICRO-STAR
INTERNATIONAL):
@@ -259,7 +259,7 @@ config MSI_LAPTOP
config PANASONIC_LAPTOP
tristate "Panasonic Laptop Extras"
depends on X86 && INPUT && ACPI
- depends on BACKLIGHT_CLASS_DEVICE
+ depends on BACKLIGHT_CLASS_DEVICE
---help---
This driver adds support for access to backlight control and hotkeys
on Panasonic Let's Note laptops.
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 817f7f5..bcde73b 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -1,9 +1,6 @@
#
# Makefile for misc devices that really don't fit anywhere else.
#
-obj- := misc.o # Dummy rule to force built-in.o to be made
-
-obj-$(CONFIG_IBM_ASM) += ibmasm/
obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
--
1.5.6.5
^ permalink raw reply related
* [PATCH 2/2] create drivers/platform/x86/ from drivers/misc/
From: Len Brown @ 2008-12-01 6:05 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Stephen Rothwell, Len Brown, linux-next, LKML, Randy Dunlap, x86,
linux-acpi
In-Reply-To: <alpine.LFD.2.00.0812010053100.3314@localhost.localdomain>
From: Len Brown <len.brown@intel.com>
Move x86 platform specific drivers from drivers/misc/
to a new home under drivers/platform/x86/.
The community has been maintaining x86 vendor-specific
platform specific drivers under /drivers/misc/ for a few years.
The oldest ones started life under drivers/acpi.
They moved out of drivers/acpi/ because they don't actually
implement the ACPI specification, but either simply
use ACPI, or implement vendor-specific ACPI extensions.
In the future we anticipate...
drivers/misc/ will go away.
other architectures will create drivers/platform/<arch>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/misc/Kconfig | 280 -------------------
drivers/misc/Makefile | 12 -
drivers/platform/Kconfig | 5 +
drivers/platform/Makefile | 5 +
drivers/platform/x86/Kconfig | 297 +++++++++++++++++++++
drivers/platform/x86/Makefile | 16 ++
drivers/{misc => platform/x86}/acer-wmi.c | 0
drivers/{misc => platform/x86}/asus-laptop.c | 0
drivers/{misc => platform/x86}/compal-laptop.c | 0
drivers/{misc => platform/x86}/eeepc-laptop.c | 0
drivers/{misc => platform/x86}/fujitsu-laptop.c | 0
drivers/{misc => platform/x86}/hp-wmi.c | 0
drivers/{misc => platform/x86}/intel_menlow.c | 0
drivers/{misc => platform/x86}/msi-laptop.c | 0
drivers/{misc => platform/x86}/panasonic-laptop.c | 0
drivers/{misc => platform/x86}/sony-laptop.c | 0
drivers/{misc => platform/x86}/tc1100-wmi.c | 0
drivers/{misc => platform/x86}/thinkpad_acpi.c | 0
20 files changed, 326 insertions(+), 292 deletions(-)
create mode 100644 drivers/platform/Kconfig
create mode 100644 drivers/platform/Makefile
create mode 100644 drivers/platform/x86/Kconfig
create mode 100644 drivers/platform/x86/Makefile
rename drivers/{misc => platform/x86}/acer-wmi.c (100%)
rename drivers/{misc => platform/x86}/asus-laptop.c (100%)
rename drivers/{misc => platform/x86}/compal-laptop.c (100%)
rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%)
rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%)
rename drivers/{misc => platform/x86}/hp-wmi.c (100%)
rename drivers/{misc => platform/x86}/intel_menlow.c (100%)
rename drivers/{misc => platform/x86}/msi-laptop.c (100%)
rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%)
rename drivers/{misc => platform/x86}/sony-laptop.c (100%)
rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%)
rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 2f557f5..00cf955 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -107,4 +107,6 @@ source "drivers/uio/Kconfig"
source "drivers/xen/Kconfig"
source "drivers/staging/Kconfig"
+
+source "drivers/platform/Kconfig"
endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index fceb71a..46d4828 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -102,3 +102,4 @@ obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_REGULATOR) += regulator/
obj-$(CONFIG_STAGING) += staging/
+obj-y += platform/
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index dcf6169..8574879 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -136,97 +136,6 @@ config TIFM_7XX1
To compile this driver as a module, choose M here: the module will
be called tifm_7xx1.
-config ACER_WMI
- tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
- depends on X86
- depends on EXPERIMENTAL
- depends on ACPI
- depends on LEDS_CLASS
- depends on NEW_LEDS
- depends on BACKLIGHT_CLASS_DEVICE
- depends on SERIO_I8042
- depends on RFKILL
- select ACPI_WMI
- ---help---
- This is a driver for newer Acer (and Wistron) laptops. It adds
- wireless radio and bluetooth control, and on some laptops,
- exposes the mail LED and LCD backlight.
-
- For more information about this driver see
- <file:Documentation/laptops/acer-wmi.txt>
-
- If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
- here.
-
-config ASUS_LAPTOP
- tristate "Asus Laptop Extras (EXPERIMENTAL)"
- depends on X86
- depends on ACPI
- depends on EXPERIMENTAL && !ACPI_ASUS
- depends on LEDS_CLASS
- depends on NEW_LEDS
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
- This is the new Linux driver for Asus laptops. It may also support some
- MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
- standard ACPI events that go through /proc/acpi/events. It also adds
- support for video output switching, LCD backlight control, Bluetooth and
- Wlan control, and most importantly, allows you to blink those fancy LEDs.
-
- For more information and a userspace daemon for handling the extra
- buttons see <http://acpi4asus.sf.net/>.
-
- If you have an ACPI-compatible ASUS laptop, say Y or M here.
-
-config FUJITSU_LAPTOP
- tristate "Fujitsu Laptop Extras"
- depends on X86
- depends on ACPI
- depends on INPUT
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
- This is a driver for laptops built by Fujitsu:
-
- * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
- * Possibly other Fujitsu laptop models
- * Tested with S6410 and S7020
-
- It adds support for LCD brightness control and some hotkeys.
-
- If you have a Fujitsu laptop, say Y or M here.
-
-config FUJITSU_LAPTOP_DEBUG
- bool "Verbose debug mode for Fujitsu Laptop Extras"
- depends on FUJITSU_LAPTOP
- default n
- ---help---
- Enables extra debug output from the fujitsu extras driver, at the
- expense of a slight increase in driver size.
-
- If you are not sure, say N here.
-
-config TC1100_WMI
- tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
- depends on X86 && !X86_64
- depends on EXPERIMENTAL
- depends on ACPI
- select ACPI_WMI
- ---help---
- This is a driver for the WMI extensions (wireless and bluetooth power
- control) of the HP Compaq TC1100 tablet.
-
-config HP_WMI
- tristate "HP WMI extras"
- depends on ACPI_WMI
- depends on INPUT
- depends on RFKILL
- help
- Say Y here if you want to support WMI-based hotkeys on HP laptops and
- to read data from WMI such as docking or ambient light sensor state.
-
- To compile this driver as a module, choose M here: the module will
- be called hp-wmi.
-
config ICS932S401
tristate "Integrated Circuits ICS932S401"
depends on I2C && EXPERIMENTAL
@@ -237,170 +146,6 @@ config ICS932S401
This driver can also be built as a module. If so, the module
will be called ics932s401.
-config MSI_LAPTOP
- tristate "MSI Laptop Extras"
- depends on X86
- depends on ACPI
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
- This is a driver for laptops built by MSI (MICRO-STAR
- INTERNATIONAL):
-
- MSI MegaBook S270 (MS-1013)
- Cytron/TCM/Medion/Tchibo MD96100/SAM2000
-
- It adds support for Bluetooth, WLAN and LCD brightness control.
-
- More information about this driver is available at
- <http://0pointer.de/lennart/tchibo.html>.
-
- If you have an MSI S270 laptop, say Y or M here.
-
-config PANASONIC_LAPTOP
- tristate "Panasonic Laptop Extras"
- depends on X86 && INPUT && ACPI
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
- This driver adds support for access to backlight control and hotkeys
- on Panasonic Let's Note laptops.
-
- If you have a Panasonic Let's note laptop (such as the R1(N variant),
- R2, R3, R5, T2, W2 and Y2 series), say Y.
-
-config COMPAL_LAPTOP
- tristate "Compal Laptop Extras"
- depends on X86
- depends on ACPI
- depends on BACKLIGHT_CLASS_DEVICE
- ---help---
- This is a driver for laptops built by Compal:
-
- Compal FL90/IFL90
- Compal FL91/IFL91
- Compal FL92/JFL92
- Compal FT00/IFT00
-
- It adds support for Bluetooth, WLAN and LCD brightness control.
-
- If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
-
-config SONY_LAPTOP
- tristate "Sony Laptop Extras"
- depends on X86 && ACPI
- select BACKLIGHT_CLASS_DEVICE
- depends on INPUT
- ---help---
- This mini-driver drives the SNC and SPIC devices present in the ACPI
- BIOS of the Sony Vaio laptops.
-
- It gives access to some extra laptop functionalities like Bluetooth,
- screen brightness control, Fn keys and allows powering on/off some
- devices.
-
- Read <file:Documentation/laptops/sony-laptop.txt> for more information.
-
-config SONYPI_COMPAT
- bool "Sonypi compatibility"
- depends on SONY_LAPTOP
- ---help---
- Build the sonypi driver compatibility code into the sony-laptop driver.
-
-config THINKPAD_ACPI
- tristate "ThinkPad ACPI Laptop Extras"
- depends on X86 && ACPI
- select BACKLIGHT_LCD_SUPPORT
- select BACKLIGHT_CLASS_DEVICE
- select HWMON
- select NVRAM
- select INPUT
- select NEW_LEDS
- select LEDS_CLASS
- select NET
- select RFKILL
- ---help---
- This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
- support for Fn-Fx key combinations, Bluetooth control, video
- output switching, ThinkLight control, UltraBay eject and more.
- For more information about this driver see
- <file:Documentation/laptops/thinkpad-acpi.txt> and
- <http://ibm-acpi.sf.net/> .
-
- This driver was formerly known as ibm-acpi.
-
- If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
-
-config THINKPAD_ACPI_DEBUG
- bool "Verbose debug mode"
- depends on THINKPAD_ACPI
- default n
- ---help---
- Enables extra debugging information, at the expense of a slightly
- increase in driver size.
-
- If you are not sure, say N here.
-
-config THINKPAD_ACPI_DOCK
- bool "Legacy Docking Station Support"
- depends on THINKPAD_ACPI
- depends on ACPI_DOCK=n
- default n
- ---help---
- Allows the thinkpad_acpi driver to handle docking station events.
- This support was made obsolete by the generic ACPI docking station
- support (CONFIG_ACPI_DOCK). It will allow locking and removing the
- laptop from the docking station, but will not properly connect PCI
- devices.
-
- If you are not sure, say N here.
-
-config THINKPAD_ACPI_BAY
- bool "Legacy Removable Bay Support"
- depends on THINKPAD_ACPI
- default y
- ---help---
- Allows the thinkpad_acpi driver to handle removable bays. It will
- electrically disable the device in the bay, and also generate
- notifications when the bay lever is ejected or inserted.
-
- If you are not sure, say Y here.
-
-config THINKPAD_ACPI_VIDEO
- bool "Video output control support"
- depends on THINKPAD_ACPI
- default y
- ---help---
- Allows the thinkpad_acpi driver to provide an interface to control
- the various video output ports.
-
- This feature often won't work well, depending on ThinkPad model,
- display state, video output devices in use, whether there is a X
- server running, phase of the moon, and the current mood of
- Schroedinger's cat. If you can use X.org's RandR to control
- your ThinkPad's video output ports instead of this feature,
- don't think twice: do it and say N here to save some memory.
-
- If you are not sure, say Y here.
-
-config THINKPAD_ACPI_HOTKEY_POLL
- bool "Support NVRAM polling for hot keys"
- depends on THINKPAD_ACPI
- default y
- ---help---
- Some thinkpad models benefit from NVRAM polling to detect a few of
- the hot key press events. If you know your ThinkPad model does not
- need to do NVRAM polling to support any of the hot keys you use,
- unselecting this option will save about 1kB of memory.
-
- ThinkPads T40 and newer, R52 and newer, and X31 and newer are
- unlikely to need NVRAM polling in their latest BIOS versions.
-
- NVRAM polling can detect at most the following keys: ThinkPad/Access
- IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
- Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
-
- If you are not sure, say Y here. The driver enables polling only if
- it is strictly necessary to do so.
-
config ATMEL_SSC
tristate "Device driver for Atmel SSC peripheral"
depends on AVR32 || ARCH_AT91
@@ -413,31 +158,6 @@ config ATMEL_SSC
If unsure, say N.
-config INTEL_MENLOW
- tristate "Thermal Management driver for Intel menlow platform"
- depends on ACPI_THERMAL
- select THERMAL
- depends on X86
- ---help---
- ACPI thermal management enhancement driver on
- Intel Menlow platform.
-
- If unsure, say N.
-
-config EEEPC_LAPTOP
- tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
- depends on X86
- depends on ACPI
- depends on BACKLIGHT_CLASS_DEVICE
- depends on HWMON
- depends on EXPERIMENTAL
- depends on RFKILL
- ---help---
- This driver supports the Fn-Fx keys on Eee PC laptops.
- It also adds the ability to switch camera/wlan on/off.
-
- If you have an Eee PC laptop, say Y or M here.
-
config ENCLOSURE_SERVICES
tristate "Enclosure Services"
default n
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index bcde73b..5af1794 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -2,28 +2,16 @@
# Makefile for misc devices that really don't fit anywhere else.
#
obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
-obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
-obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
-obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
-obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o
-obj-$(CONFIG_ACER_WMI) += acer-wmi.o
obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o
obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
-obj-$(CONFIG_HP_WMI) += hp-wmi.o
obj-$(CONFIG_ICS932S401) += ics932s401.o
-obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
obj-$(CONFIG_LKDTM) += lkdtm.o
obj-$(CONFIG_TIFM_CORE) += tifm_core.o
obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o
obj-$(CONFIG_PHANTOM) += phantom.o
obj-$(CONFIG_SGI_IOC4) += ioc4.o
-obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
-obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
-obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o
-obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o
obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
-obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
obj-$(CONFIG_KGDB_TESTS) += kgdbts.o
obj-$(CONFIG_SGI_XP) += sgi-xp/
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
new file mode 100644
index 0000000..9652c3f
--- /dev/null
+++ b/drivers/platform/Kconfig
@@ -0,0 +1,5 @@
+# drivers/platform/Kconfig
+
+if X86
+source "drivers/platform/x86/Kconfig"
+endif
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
new file mode 100644
index 0000000..782953a
--- /dev/null
+++ b/drivers/platform/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for linux/drivers/platform
+#
+
+obj-$(CONFIG_X86) += x86/
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
new file mode 100644
index 0000000..4bb1e54
--- /dev/null
+++ b/drivers/platform/x86/Kconfig
@@ -0,0 +1,297 @@
+#
+# X86 Platform Specific Drivers
+#
+
+menuconfig X86_PLATFORM_DEVICES
+ bool "X86 Platform Specific Device Drivers"
+ default y
+ ---help---
+ Say Y here to get to see options for device drivers for various
+ x86 platforms, including vendor-specific laptop extension drivers.
+ This option alone does not add any kernel code.
+
+ If you say N, all options in this submenu will be skipped and disabled.
+
+if X86_PLATFORM_DEVICES
+
+config ACER_WMI
+ tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
+ depends on X86
+ depends on EXPERIMENTAL
+ depends on ACPI
+ depends on LEDS_CLASS
+ depends on NEW_LEDS
+ depends on BACKLIGHT_CLASS_DEVICE
+ depends on SERIO_I8042
+ depends on RFKILL
+ select ACPI_WMI
+ ---help---
+ This is a driver for newer Acer (and Wistron) laptops. It adds
+ wireless radio and bluetooth control, and on some laptops,
+ exposes the mail LED and LCD backlight.
+
+ For more information about this driver see
+ <file:Documentation/laptops/acer-wmi.txt>
+
+ If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
+ here.
+
+config ASUS_LAPTOP
+ tristate "Asus Laptop Extras (EXPERIMENTAL)"
+ depends on X86
+ depends on ACPI
+ depends on EXPERIMENTAL && !ACPI_ASUS
+ depends on LEDS_CLASS
+ depends on NEW_LEDS
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
+ This is the new Linux driver for Asus laptops. It may also support some
+ MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
+ standard ACPI events that go through /proc/acpi/events. It also adds
+ support for video output switching, LCD backlight control, Bluetooth and
+ Wlan control, and most importantly, allows you to blink those fancy LEDs.
+
+ For more information and a userspace daemon for handling the extra
+ buttons see <http://acpi4asus.sf.net/>.
+
+ If you have an ACPI-compatible ASUS laptop, say Y or M here.
+
+config FUJITSU_LAPTOP
+ tristate "Fujitsu Laptop Extras"
+ depends on X86
+ depends on ACPI
+ depends on INPUT
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
+ This is a driver for laptops built by Fujitsu:
+
+ * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
+ * Possibly other Fujitsu laptop models
+ * Tested with S6410 and S7020
+
+ It adds support for LCD brightness control and some hotkeys.
+
+ If you have a Fujitsu laptop, say Y or M here.
+
+config FUJITSU_LAPTOP_DEBUG
+ bool "Verbose debug mode for Fujitsu Laptop Extras"
+ depends on FUJITSU_LAPTOP
+ default n
+ ---help---
+ Enables extra debug output from the fujitsu extras driver, at the
+ expense of a slight increase in driver size.
+
+ If you are not sure, say N here.
+
+config TC1100_WMI
+ tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
+ depends on X86 && !X86_64
+ depends on EXPERIMENTAL
+ depends on ACPI
+ select ACPI_WMI
+ ---help---
+ This is a driver for the WMI extensions (wireless and bluetooth power
+ control) of the HP Compaq TC1100 tablet.
+
+config HP_WMI
+ tristate "HP WMI extras"
+ depends on ACPI_WMI
+ depends on INPUT
+ depends on RFKILL
+ help
+ Say Y here if you want to support WMI-based hotkeys on HP laptops and
+ to read data from WMI such as docking or ambient light sensor state.
+
+ To compile this driver as a module, choose M here: the module will
+ be called hp-wmi.
+
+config MSI_LAPTOP
+ tristate "MSI Laptop Extras"
+ depends on X86
+ depends on ACPI
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
+ This is a driver for laptops built by MSI (MICRO-STAR
+ INTERNATIONAL):
+
+ MSI MegaBook S270 (MS-1013)
+ Cytron/TCM/Medion/Tchibo MD96100/SAM2000
+
+ It adds support for Bluetooth, WLAN and LCD brightness control.
+
+ More information about this driver is available at
+ <http://0pointer.de/lennart/tchibo.html>.
+
+ If you have an MSI S270 laptop, say Y or M here.
+
+config PANASONIC_LAPTOP
+ tristate "Panasonic Laptop Extras"
+ depends on X86 && INPUT && ACPI
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
+ This driver adds support for access to backlight control and hotkeys
+ on Panasonic Let's Note laptops.
+
+ If you have a Panasonic Let's note laptop (such as the R1(N variant),
+ R2, R3, R5, T2, W2 and Y2 series), say Y.
+
+config COMPAL_LAPTOP
+ tristate "Compal Laptop Extras"
+ depends on X86
+ depends on ACPI
+ depends on BACKLIGHT_CLASS_DEVICE
+ ---help---
+ This is a driver for laptops built by Compal:
+
+ Compal FL90/IFL90
+ Compal FL91/IFL91
+ Compal FL92/JFL92
+ Compal FT00/IFT00
+
+ It adds support for Bluetooth, WLAN and LCD brightness control.
+
+ If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
+
+config SONY_LAPTOP
+ tristate "Sony Laptop Extras"
+ depends on X86 && ACPI
+ select BACKLIGHT_CLASS_DEVICE
+ depends on INPUT
+ ---help---
+ This mini-driver drives the SNC and SPIC devices present in the ACPI
+ BIOS of the Sony Vaio laptops.
+
+ It gives access to some extra laptop functionalities like Bluetooth,
+ screen brightness control, Fn keys and allows powering on/off some
+ devices.
+
+ Read <file:Documentation/laptops/sony-laptop.txt> for more information.
+
+config SONYPI_COMPAT
+ bool "Sonypi compatibility"
+ depends on SONY_LAPTOP
+ ---help---
+ Build the sonypi driver compatibility code into the sony-laptop driver.
+
+config THINKPAD_ACPI
+ tristate "ThinkPad ACPI Laptop Extras"
+ depends on X86 && ACPI
+ select BACKLIGHT_LCD_SUPPORT
+ select BACKLIGHT_CLASS_DEVICE
+ select HWMON
+ select NVRAM
+ select INPUT
+ select NEW_LEDS
+ select LEDS_CLASS
+ select NET
+ select RFKILL
+ ---help---
+ This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
+ support for Fn-Fx key combinations, Bluetooth control, video
+ output switching, ThinkLight control, UltraBay eject and more.
+ For more information about this driver see
+ <file:Documentation/laptops/thinkpad-acpi.txt> and
+ <http://ibm-acpi.sf.net/> .
+
+ This driver was formerly known as ibm-acpi.
+
+ If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
+
+config THINKPAD_ACPI_DEBUG
+ bool "Verbose debug mode"
+ depends on THINKPAD_ACPI
+ default n
+ ---help---
+ Enables extra debugging information, at the expense of a slightly
+ increase in driver size.
+
+ If you are not sure, say N here.
+
+config THINKPAD_ACPI_DOCK
+ bool "Legacy Docking Station Support"
+ depends on THINKPAD_ACPI
+ depends on ACPI_DOCK=n
+ default n
+ ---help---
+ Allows the thinkpad_acpi driver to handle docking station events.
+ This support was made obsolete by the generic ACPI docking station
+ support (CONFIG_ACPI_DOCK). It will allow locking and removing the
+ laptop from the docking station, but will not properly connect PCI
+ devices.
+
+ If you are not sure, say N here.
+
+config THINKPAD_ACPI_BAY
+ bool "Legacy Removable Bay Support"
+ depends on THINKPAD_ACPI
+ default y
+ ---help---
+ Allows the thinkpad_acpi driver to handle removable bays. It will
+ electrically disable the device in the bay, and also generate
+ notifications when the bay lever is ejected or inserted.
+
+ If you are not sure, say Y here.
+
+config THINKPAD_ACPI_VIDEO
+ bool "Video output control support"
+ depends on THINKPAD_ACPI
+ default y
+ ---help---
+ Allows the thinkpad_acpi driver to provide an interface to control
+ the various video output ports.
+
+ This feature often won't work well, depending on ThinkPad model,
+ display state, video output devices in use, whether there is a X
+ server running, phase of the moon, and the current mood of
+ Schroedinger's cat. If you can use X.org's RandR to control
+ your ThinkPad's video output ports instead of this feature,
+ don't think twice: do it and say N here to save some memory.
+
+ If you are not sure, say Y here.
+
+config THINKPAD_ACPI_HOTKEY_POLL
+ bool "Support NVRAM polling for hot keys"
+ depends on THINKPAD_ACPI
+ default y
+ ---help---
+ Some thinkpad models benefit from NVRAM polling to detect a few of
+ the hot key press events. If you know your ThinkPad model does not
+ need to do NVRAM polling to support any of the hot keys you use,
+ unselecting this option will save about 1kB of memory.
+
+ ThinkPads T40 and newer, R52 and newer, and X31 and newer are
+ unlikely to need NVRAM polling in their latest BIOS versions.
+
+ NVRAM polling can detect at most the following keys: ThinkPad/Access
+ IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
+ Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
+
+ If you are not sure, say Y here. The driver enables polling only if
+ it is strictly necessary to do so.
+
+config INTEL_MENLOW
+ tristate "Thermal Management driver for Intel menlow platform"
+ depends on ACPI_THERMAL
+ select THERMAL
+ depends on X86
+ ---help---
+ ACPI thermal management enhancement driver on
+ Intel Menlow platform.
+
+ If unsure, say N.
+
+config EEEPC_LAPTOP
+ tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
+ depends on X86
+ depends on ACPI
+ depends on BACKLIGHT_CLASS_DEVICE
+ depends on HWMON
+ depends on EXPERIMENTAL
+ depends on RFKILL
+ ---help---
+ This driver supports the Fn-Fx keys on Eee PC laptops.
+ It also adds the ability to switch camera/wlan on/off.
+
+ If you have an Eee PC laptop, say Y or M here.
+
+endif # X86_PLATFORM_DEVICES
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
new file mode 100644
index 0000000..4d26b1b
--- /dev/null
+++ b/drivers/platform/x86/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for linux/drivers/platform/x86
+# x86 Platform-Specific Drivers
+#
+obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
+obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
+obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
+obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o
+obj-$(CONFIG_ACER_WMI) += acer-wmi.o
+obj-$(CONFIG_HP_WMI) += hp-wmi.o
+obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
+obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
+obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
+obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o
+obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o
+obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
diff --git a/drivers/misc/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
similarity index 100%
rename from drivers/misc/acer-wmi.c
rename to drivers/platform/x86/acer-wmi.c
diff --git a/drivers/misc/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
similarity index 100%
rename from drivers/misc/asus-laptop.c
rename to drivers/platform/x86/asus-laptop.c
diff --git a/drivers/misc/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
similarity index 100%
rename from drivers/misc/compal-laptop.c
rename to drivers/platform/x86/compal-laptop.c
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
similarity index 100%
rename from drivers/misc/eeepc-laptop.c
rename to drivers/platform/x86/eeepc-laptop.c
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
similarity index 100%
rename from drivers/misc/fujitsu-laptop.c
rename to drivers/platform/x86/fujitsu-laptop.c
diff --git a/drivers/misc/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
similarity index 100%
rename from drivers/misc/hp-wmi.c
rename to drivers/platform/x86/hp-wmi.c
diff --git a/drivers/misc/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
similarity index 100%
rename from drivers/misc/intel_menlow.c
rename to drivers/platform/x86/intel_menlow.c
diff --git a/drivers/misc/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
similarity index 100%
rename from drivers/misc/msi-laptop.c
rename to drivers/platform/x86/msi-laptop.c
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
similarity index 100%
rename from drivers/misc/panasonic-laptop.c
rename to drivers/platform/x86/panasonic-laptop.c
diff --git a/drivers/misc/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
similarity index 100%
rename from drivers/misc/sony-laptop.c
rename to drivers/platform/x86/sony-laptop.c
diff --git a/drivers/misc/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
similarity index 100%
rename from drivers/misc/tc1100-wmi.c
rename to drivers/platform/x86/tc1100-wmi.c
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
similarity index 100%
rename from drivers/misc/thinkpad_acpi.c
rename to drivers/platform/x86/thinkpad_acpi.c
--
1.5.6.5
^ permalink raw reply related
* linux-next: boot failure on 8 way PowerPC
From: Stephen Rothwell @ 2008-12-01 7:07 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 2798 bytes --]
Hi Rusty,
Booting next-20081128 on an 8 way (4 core, threaded) Power 5+ lpar
produces this panic:
Begin: Mounting root file system... ...
Begin: Running /scripts/local-top ...
Done.
Begin: Waiting for root file system... ...
Kernel panic - not syncing: bad return code qirr - rc = fffffffffffffffc
Call Trace:
[c0000000bce4b4b0] [c0000000000108cc] .show_stack+0x5c/0x1b0 (unreliable)
[c0000000bce4b560] [c00000000005dcd8] .panic+0x88/0x1d0
[c0000000bce4b610] [c000000000040e28] .smp_xics_message_pass+0xf8/0x230
[c0000000bce4b6b0] [c00000000002b0f0] .arch_send_call_function_ipi+0x60/0xb0
[c0000000bce4b740] [c00000000008d64c] .smp_call_function_many+0x20c/0x360
[c0000000bce4b810] [c00000000008d7d8] .smp_call_function+0x38/0x50
[c0000000bce4b890] [c000000000064e44] .on_each_cpu+0x24/0x90
[c0000000bce4b930] [c0000000001230c4] .invalidate_bh_lrus+0x24/0x40
[c0000000bce4b9b0] [c00000000012b3b4] .kill_bdev+0x34/0x60
[c0000000bce4ba30] [c00000000012bfa4] .__blkdev_put+0x1d4/0x220
[c0000000bce4bae0] [c0000000000f59c4] .__fput+0xf4/0x250
[c0000000bce4bb80] [c0000000000f1b70] .filp_close+0xa0/0x100
[c0000000bce4bc10] [c0000000000609c4] .put_files_struct+0x154/0x170
[c0000000bce4bcc0] [c000000000062574] .do_exit+0x184/0x900
[c0000000bce4bda0] [c000000000062d40] .do_group_exit+0x50/0xf0
[c0000000bce4be30] [c0000000000084ac] syscall_exit+0x0/0x40
The rc = fffffffffffffffc is an error code from the hypervisor and means
"bad parameter".
I bisected it down to:
commit 8418cd49a5c479812c4e550bfafb4388fc1fc9ab
Author: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri Nov 28 10:11:29 2008 +1100
cpumask:smp_call_function_many
Impact: Implementation change to remove cpumask_t from stack.
Actually change smp_call_function_mask() to smp_call_function_many().
We avoid cpumasks on the stack in this version.
(S390 has its own version, but that's going away apparently).
We have to do some dancing to figure out if 0 or 1 other cpus are in
the mask supplied and the online mask without allocating a tmp
cpumask. It's still fairly cheap.
We allocate the cpumask at the end of the call_function_data
structure: if allocation fails we fallback to smp_call_function_single
rather than using the baroque quiescing code (which needs a cpumask on
stack).
(Thanks to Hiroshi Shimamoto for spotting several bugs in previous versions!)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Cc: npiggin@suse.de
Cc: axboe@kernel.dk
--
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 net tree
From: David Miller @ 2008-12-01 7:20 UTC (permalink / raw)
To: sfr; +Cc: linux-next, viro, vapier, jgarzik
In-Reply-To: <20081201142623.5c38680b.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Dec 2008 14:26:23 +1100
> Hi Dave,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/smc91x.c between commit
> f57628d76bd201a444ca822f3622522a44acbf60 ("section errors in
> smc911x/smc91x") from Linus' tree and commit smc_drv_probe ("smc91x: add
> __init markings to smc_drv_probe()") from the net tree.
>
> The former changed smc_drv_probe() to __devinit while the latter to
> __init. I used the latter and it can be fixed up in your tree.
>
> I do wonder why the former change didn't go through Jeff's tree ...
Linus applied a lot of things from Al today he shouldn't have.
^ permalink raw reply
* Re: linux-next: sparc tree build failure
From: David Miller @ 2008-12-01 7:23 UTC (permalink / raw)
To: sam; +Cc: sfr, linux-next
In-Reply-To: <20081201054140.GA21718@uranus.ravnborg.org>
From: Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 1 Dec 2008 06:41:40 +0100
> On Mon, Dec 01, 2008 at 10:46:39AM +1100, Stephen Rothwell wrote:
> > Hi Dave,
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> >
> > GEN /scratch/sfr/powerpc_ppc64_defconfig/Makefile
> > ***
> > *** Can't find default configuration "arch/sparc/configs/ppc64_defconfig"!
> > ***
> >
> > Caused by commit 9cdcf85e1bf5dca97c1304292810041af2fcbd42 ("Subject:
> > [PATCH 08/10] sparc,sparc64: unify Makefile") which seems to arbitrarily
> > set SRCARCH in the top level make file to sparc!
> Crap - missed an if/endif
> Fix is simple:
Applied, thanks Sam.
World sparc domination almost worked :)
^ 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