* Re: linux-next: voltage tree build failure
From: Jonathan Cameron @ 2009-01-21 14:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next
In-Reply-To: <20090121134600.d6e60b2f.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Liam,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/regulator/wm8350-regulator.c: In function 'pmic_uv_handler':
> drivers/regulator/wm8350-regulator.c:1296: error: dereferencing pointer to incomplete type
> drivers/regulator/wm8350-regulator.c:1305: error: dereferencing pointer to incomplete type
>
> Immediate cause is commit 872ed3fe176833f7d43748eb88010da4bbd2f983
> ("Regulator: Push lock out of _notifier_call_chain + add voltage change
> event").
>
> I have dropped the voltage tree for today.
Sorry, my error... It's always the simple changes that you don't build
test properly that catch you out.
Liam, can you revert this patch for now and I'll send a version
that doesn't have this problem shortly.
Jonathan
^ permalink raw reply
* Re: X200 suspend issue / linux-next: Tree for January 21
From: Nico -telmich- Schottelius @ 2009-01-21 14:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20090121150249.a87aca09.sfr@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 342 bytes --]
Hello!
News: The system freezes for almost a second and wakes up again!
At least no crash this time!
dmesg attached after one suspend failure.
Nico
--
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/
PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C
[-- Attachment #1.2: suspend-2.6.29-rc2-next-20090121-ikn --]
[-- Type: text/plain, Size: 12122 bytes --]
Autowakeup!
[15:38] ikn:~# dmesg -c
[ 7411.999645] PM: Syncing filesystems ... done.
[ 7412.658583] Freezing user space processes ... (elapsed 0.01 seconds) done.
[ 7412.677241] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
[ 7412.677666] Suspending console(s) (use no_console_suspend to debug)
[ 7412.692209] pci 0000:00:02.0: power state changed by ACPI to D3
[ 7413.368500] sd 0:0:0:0: [sda] Synchronizing SCSI cache
[ 7413.368738] sd 0:0:0:0: [sda] Stopping disk
[ 7413.739464] iwlagn 0000:03:00.0: PCI INT A disabled
[ 7413.800393] ehci_hcd 0000:00:1d.7: PME# enabled
[ 7413.802570] ehci_hcd 0000:00:1d.7: wake-up capability enabled by ACPI
[ 7413.802586] ehci_hcd 0000:00:1d.7: PCI INT D disabled
[ 7413.802828] uhci_hcd 0000:00:1d.2: wake-up capability enabled by ACPI
[ 7413.802838] uhci_hcd 0000:00:1d.2: PCI INT C disabled
[ 7413.803050] uhci_hcd 0000:00:1d.1: wake-up capability enabled by ACPI
[ 7413.803059] uhci_hcd 0000:00:1d.1: PCI INT B disabled
[ 7413.805476] uhci_hcd 0000:00:1d.0: wake-up capability enabled by ACPI
[ 7413.805489] uhci_hcd 0000:00:1d.0: PCI INT A disabled
[ 7413.805751] HDA Intel 0000:00:1b.0: PCI INT B disabled
[ 7413.820125] ehci_hcd 0000:00:1a.7: PME# enabled
[ 7413.823016] ehci_hcd 0000:00:1a.7: wake-up capability enabled by ACPI
[ 7413.823034] ehci_hcd 0000:00:1a.7: PCI INT D disabled
[ 7413.825414] uhci_hcd 0000:00:1a.2: wake-up capability enabled by ACPI
[ 7413.825424] uhci_hcd 0000:00:1a.2: PCI INT C disabled
[ 7413.825638] uhci_hcd 0000:00:1a.1: wake-up capability enabled by ACPI
[ 7413.825646] uhci_hcd 0000:00:1a.1: PCI INT B disabled
[ 7413.828564] uhci_hcd 0000:00:1a.0: wake-up capability enabled by ACPI
[ 7413.828575] uhci_hcd 0000:00:1a.0: PCI INT A disabled
[ 7413.887091] e1000e 0000:00:19.0: PME# enabled
[ 7413.887124] e1000e 0000:00:19.0: wake-up capability enabled by ACPI
[ 7413.887131] e1000e 0000:00:19.0: PME# enabled
[ 7413.887136] e1000e 0000:00:19.0: wake-up capability enabled by ACPI
[ 7413.887147] e1000e 0000:00:19.0: PCI INT A disabled
[ 7413.900175] ACPI handle has no context!
[ 7413.964505] pci 0000:00:02.0: power state changed by ACPI to D3
[ 7413.969943] ACPI: Preparing to enter system sleep state S3
[ 7413.988894] Disabling non-boot CPUs ...
[ 7414.092021] CPU 1 is now offline
[ 7414.092025] SMP alternatives: switching to UP code
[ 7414.260316] CPU1 is down
[ 7414.260420] Extended CMOS year: 2000
[ 7414.260420] Back to C!
[ 7414.260420] Extended CMOS year: 2000
[ 7414.260420] pci 0000:00:02.0: restoring config space at offset 0x1 (was 0x900007, writing 0x900403)
[ 7414.260420] pci 0000:00:02.1: restoring config space at offset 0x1 (was 0x900000, writing 0x900007)
[ 7414.260420] pci 0000:00:03.0: restoring config space at offset 0xf (was 0x100, writing 0x10b)
[ 7414.260420] pci 0000:00:03.0: restoring config space at offset 0x1 (was 0x100006, writing 0x180006)
[ 7414.260420] pci 0000:00:03.2: restoring config space at offset 0xf (was 0x300, writing 0x30b)
[ 7414.260420] pci 0000:00:03.2: restoring config space at offset 0x1 (was 0xb00005, writing 0xb00001)
[ 7414.260420] serial 0000:00:03.3: restoring config space at offset 0xf (was 0x200, writing 0x20b)
[ 7414.260420] uhci_hcd 0000:00:1a.0: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1a.1: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1a.2: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] ehci_hcd 0000:00:1a.7: restoring config space at offset 0x1 (was 0x2900106, writing 0x2900102)
[ 7414.260420] HDA Intel 0000:00:1b.0: restoring config space at offset 0x1 (was 0x100106, writing 0x100102)
[ 7414.260420] pcieport-driver 0000:00:1c.0: restoring config space at offset 0x1 (was 0x100107, writing 0x100503)
[ 7414.260420] pcieport-driver 0000:00:1c.1: restoring config space at offset 0x1 (was 0x100107, writing 0x100503)
[ 7414.260420] pcieport-driver 0000:00:1c.3: restoring config space at offset 0x1 (was 0x100107, writing 0x100503)
[ 7414.260420] uhci_hcd 0000:00:1d.0: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1d.1: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1d.2: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] ehci_hcd 0000:00:1d.7: restoring config space at offset 0x1 (was 0x2900106, writing 0x2900102)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0xf (was 0x40000, writing 0x400ff)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x9 (was 0x10001, writing 0x1fff1)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x8 (was 0x0, writing 0xfff0)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x7 (was 0x22800000, writing 0x228000f0)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x1 (was 0x100000, writing 0x100103)
[ 7414.260420] ahci 0000:00:1f.2: restoring config space at offset 0x1 (was 0x2b00007, writing 0x2b00407)
[ 7414.260420] Enabling non-boot CPUs ...
[ 7414.260420] SMP alternatives: switching to SMP code
[ 7414.383355] Booting processor 1 APIC 0x1 ip 0x6000
[ 7414.253790] Initializing CPU#1
[ 7414.253790] Calibrating delay using timer specific routine.. 4522.02 BogoMIPS (lpj=9044057)
[ 7414.253790] CPU: L1 I cache: 32K, L1 D cache: 32K
[ 7414.253790] CPU: L2 cache: 3072K
[ 7414.253790] [ds] using core 2 configuration
[ 7414.253790] CPU: Physical Processor ID: 0
[ 7414.253790] CPU: Processor Core ID: 1
[ 7414.253790] CPU1: Thermal monitoring enabled (TM2)
[ 7414.472519] CPU1: Intel(R) Core(TM)2 Duo CPU P8400 @ 2.26GHz stepping 06
[ 7414.473010] Switched to high resolution mode on CPU 1
[ 7414.484309] CPU1 is up
[ 7414.484311] ACPI: Waking up from system sleep state S3
[ 7414.524853] ACPI: EC: non-query interrupt received, switching to interrupt mode
[ 7414.616959] pci 0000:00:02.0: PME# disabled
[ 7414.616969] pci 0000:00:02.1: PME# disabled
[ 7414.616976] pci 0000:00:03.0: PME# disabled
[ 7414.616983] pci 0000:00:03.2: PME# disabled
[ 7414.617134] e1000e 0000:00:19.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20
[ 7414.617142] e1000e 0000:00:19.0: setting latency timer to 64
[ 7414.617150] e1000e 0000:00:19.0: wake-up capability disabled by ACPI
[ 7414.617157] e1000e 0000:00:19.0: PME# disabled
[ 7414.617161] e1000e 0000:00:19.0: wake-up capability disabled by ACPI
[ 7414.617169] e1000e 0000:00:19.0: PME# disabled
[ 7414.617220] e1000e 0000:00:19.0: irq 28 for MSI/MSI-X
[ 7414.676721] uhci_hcd 0000:00:1a.0: power state changed by ACPI to D0
[ 7414.676738] uhci_hcd 0000:00:1a.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20
[ 7414.676749] uhci_hcd 0000:00:1a.0: setting latency timer to 64
[ 7414.676758] uhci_hcd 0000:00:1a.0: wake-up capability disabled by ACPI
[ 7414.676787] usb usb2: root hub lost power or was reset
[ 7414.676815] uhci_hcd 0000:00:1a.1: PCI INT B -> GSI 21 (level, low) -> IRQ 21
[ 7414.676825] uhci_hcd 0000:00:1a.1: setting latency timer to 64
[ 7414.676831] uhci_hcd 0000:00:1a.1: wake-up capability disabled by ACPI
[ 7414.676858] usb usb4: root hub lost power or was reset
[ 7414.677781] uhci_hcd 0000:00:1a.2: power state changed by ACPI to D0
[ 7414.677790] uhci_hcd 0000:00:1a.2: PCI INT C -> GSI 22 (level, low) -> IRQ 22
[ 7414.677800] uhci_hcd 0000:00:1a.2: setting latency timer to 64
[ 7414.677807] uhci_hcd 0000:00:1a.2: wake-up capability disabled by ACPI
[ 7414.677835] usb usb5: root hub lost power or was reset
[ 7414.678888] ehci_hcd 0000:00:1a.7: power state changed by ACPI to D0
[ 7414.678900] ehci_hcd 0000:00:1a.7: PCI INT D -> GSI 23 (level, low) -> IRQ 23
[ 7414.678910] ehci_hcd 0000:00:1a.7: setting latency timer to 64
[ 7414.678917] ehci_hcd 0000:00:1a.7: wake-up capability disabled by ACPI
[ 7414.678926] ehci_hcd 0000:00:1a.7: PME# disabled
[ 7414.678956] HDA Intel 0000:00:1b.0: PCI INT B -> GSI 17 (level, low) -> IRQ 17
[ 7414.678965] HDA Intel 0000:00:1b.0: setting latency timer to 64
[ 7414.679002] pcieport-driver 0000:00:1c.0: setting latency timer to 64
[ 7414.679020] pcieport-driver 0000:00:1c.1: setting latency timer to 64
[ 7414.679038] pcieport-driver 0000:00:1c.3: setting latency timer to 64
[ 7414.679939] uhci_hcd 0000:00:1d.0: power state changed by ACPI to D0
[ 7414.679948] uhci_hcd 0000:00:1d.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16
[ 7414.679958] uhci_hcd 0000:00:1d.0: setting latency timer to 64
[ 7414.679965] uhci_hcd 0000:00:1d.0: wake-up capability disabled by ACPI
[ 7414.679992] usb usb6: root hub lost power or was reset
[ 7414.680038] uhci_hcd 0000:00:1d.1: PCI INT B -> GSI 17 (level, low) -> IRQ 17
[ 7414.680049] uhci_hcd 0000:00:1d.1: setting latency timer to 64
[ 7414.680056] uhci_hcd 0000:00:1d.1: wake-up capability disabled by ACPI
[ 7414.680084] usb usb7: root hub lost power or was reset
[ 7414.680108] uhci_hcd 0000:00:1d.2: PCI INT C -> GSI 18 (level, low) -> IRQ 18
[ 7414.680118] uhci_hcd 0000:00:1d.2: setting latency timer to 64
[ 7414.680124] uhci_hcd 0000:00:1d.2: wake-up capability disabled by ACPI
[ 7414.680151] usb usb8: root hub lost power or was reset
[ 7414.681049] ehci_hcd 0000:00:1d.7: power state changed by ACPI to D0
[ 7414.681060] ehci_hcd 0000:00:1d.7: PCI INT D -> GSI 19 (level, low) -> IRQ 19
[ 7414.681071] ehci_hcd 0000:00:1d.7: setting latency timer to 64
[ 7414.681078] ehci_hcd 0000:00:1d.7: wake-up capability disabled by ACPI
[ 7414.681086] ehci_hcd 0000:00:1d.7: PME# disabled
[ 7414.681103] pci 0000:00:1e.0: setting latency timer to 64
[ 7414.681204] ahci 0000:00:1f.2: setting latency timer to 64
[ 7414.681384] iwlagn 0000:03:00.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17
[ 7414.681569] iwlagn 0000:03:00.0: irq 29 for MSI/MSI-X
[ 7414.681637] iwlagn: Radio disabled by HW RF Kill switch
[ 7414.682199] sd 0:0:0:0: [sda] Starting disk
[ 7415.000286] ata2: SATA link down (SStatus 0 SControl 300)
[ 7415.616270] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
[ 7415.709877] ata1.00: ACPI cmd ef/02:00:00:00:00:a0 succeeded
[ 7415.709885] ata1.00: ACPI cmd f5/00:00:00:00:00:a0 filtered out
[ 7415.710003] ata1.00: ACPI cmd ef/5f:00:00:00:00:a0 succeeded
[ 7415.710009] ata1.00: ACPI cmd ef/10:03:00:00:00:a0 filtered out
[ 7415.720963] ata1.00: ACPI cmd ef/02:00:00:00:00:a0 succeeded
[ 7415.720970] ata1.00: ACPI cmd f5/00:00:00:00:00:a0 filtered out
[ 7415.721085] ata1.00: ACPI cmd ef/5f:00:00:00:00:a0 succeeded
[ 7415.721091] ata1.00: ACPI cmd ef/10:03:00:00:00:a0 filtered out
[ 7415.722194] ata1.00: configured for UDMA/100
[ 7415.724815] ata1.00: configured for UDMA/100
[ 7415.740266] ata1: EH complete
[ 7415.740365] sd 0:0:0:0: [sda] 488397168 512-byte hardware sectors: (250 GB/232 GiB)
[ 7415.740398] sd 0:0:0:0: [sda] Write Protect is off
[ 7415.740402] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 7415.740449] sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[ 7415.740503] sd 0:0:0:0: [sda] 488397168 512-byte hardware sectors: (250 GB/232 GiB)
[ 7415.740532] sd 0:0:0:0: [sda] Write Protect is off
[ 7415.740536] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 7415.740581] sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[ 7417.020319] usb 1-6: reset high speed USB device using ehci_hcd and address 4
[ 7417.268284] usb 4-1: reset full speed USB device using uhci_hcd and address 2
[ 7417.419773] pci 0000:00:02.0: power state changed by ACPI to D0
[ 7417.419967] pci 0000:00:02.0: power state changed by ACPI to D0
[ 7417.419979] pci 0000:00:02.0: setting latency timer to 64
[ 7417.438607] Restarting tasks ... done.
[ 7418.529332] elantech.c: unexpected magic knock result 0x00, 0x02, 0x64.
[ 7418.845911] IBM TrackPoint firmware: 0x0e, buttons: 3/3
[ 7418.865749] input: TPPS/2 IBM TrackPoint as /class/input/input12
[15:38] ikn:~#
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] regulator: Hoist struct regulator_dev out of core to fix notifiers
From: Liam Girdwood @ 2009-01-21 14:57 UTC (permalink / raw)
To: Mark Brown, Stephen Rothwell; +Cc: linux-next, linux-kernel, Jonathan Cameron
In-Reply-To: <1232546920-14915-1-git-send-email-broonie@opensource.wolfsonmicro.com>
On Wed, 2009-01-21 at 14:08 +0000, Mark Brown wrote:
> Commit 872ed3fe176833f7d43748eb88010da4bbd2f983 caused regulator drivers
> to take the struct regulator_dev lock themselves which requires that the
> struct be visible to them. Band aid this by making the struct visible.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/regulator/core.c | 27 ---------------------------
> include/linux/regulator/driver.h | 32 ++++++++++++++++++++++++++++++++
> 2 files changed, 32 insertions(+), 27 deletions(-)
Applied and fixed.
Thanks
Liam
^ permalink raw reply
* Re: [PATCH] sysrq: include interrupt.h instead of irq.h
From: Mike Travis @ 2009-01-21 16:50 UTC (permalink / raw)
To: Heiko Carstens
Cc: Stephen Rothwell, Andrew Morton, linux-next, LKML,
Martin Schwidefsky
In-Reply-To: <1232545758.31303.2.camel@osiris.boeblingen.de.ibm.com>
Thanks for catching this Heiko!
Mike
Heiko Carstens wrote:
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
>
> With "cpumask: update irq_desc to use cpumask_var_t" in linux-next
> we get this compile bug on s390:
>
> CC drivers/char/sysrq.o
> In file included from drivers/char/sysrq.c:38:
> include/linux/irq.h: In function 'init_alloc_desc_masks':
> include/linux/irq.h:442: error: dereferencing pointer to incomplete type
>
> drivers/char/sysrq.c should include interrupt.h instead of irq.h.
>
> Cc: Mike Travis <travis@sgi.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> drivers/char/sysrq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-next/drivers/char/sysrq.c
> ===================================================================
> --- linux-next.orig/drivers/char/sysrq.c
> +++ linux-next/drivers/char/sysrq.c
> @@ -35,7 +35,7 @@
> #include <linux/vt_kern.h>
> #include <linux/workqueue.h>
> #include <linux/kexec.h>
> -#include <linux/irq.h>
> +#include <linux/interrupt.h>
> #include <linux/hrtimer.h>
> #include <linux/oom.h>
>
>
^ permalink raw reply
* Re: [PATCH] regulator: Hoist struct regulator_dev out of core to fix notifiers
From: Stephen Rothwell @ 2009-01-21 21:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: Mark Brown, linux-next, linux-kernel, Jonathan Cameron
In-Reply-To: <1232549863.16911.350.camel@vega.slimlogic.co.uk>
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
On Wed, 21 Jan 2009 14:57:43 +0000 Liam Girdwood <lrg@slimlogic.co.uk> wrote:
>
> On Wed, 2009-01-21 at 14:08 +0000, Mark Brown wrote:
> > Commit 872ed3fe176833f7d43748eb88010da4bbd2f983 caused regulator drivers
> > to take the struct regulator_dev lock themselves which requires that the
> > struct be visible to them. Band aid this by making the struct visible.
> >
> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > ---
> > drivers/regulator/core.c | 27 ---------------------------
> > include/linux/regulator/driver.h | 32 ++++++++++++++++++++++++++++++++
> > 2 files changed, 32 insertions(+), 27 deletions(-)
>
> Applied and fixed.
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 i2c tree with the pxa tree
From: Stephen Rothwell @ 2009-01-22 0:24 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next, Philipp Zabel, Eric Miao
Hi Jean,
Today's linux-next merge of the i2c tree got a conflict in
arch/arm/configs/magician_defconfig between commit
b25a386b9c68ed23c3b2656f44b523e61480218b ("[ARM] pxa/magician: Update
defconfig") from the pxa tree and commit
4f1889016ff7e12fe429ba072be215cbac63e0e0 ("eeprom: More consistent symbol
names") from the i2c tree.
Just changed context, nothing important. I fixed it up (see below) and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/arm/configs/magician_defconfig
index dde50df,73ba62b..0000000
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@@ -747,11 -675,11 +747,11 @@@ CONFIG_I2C_PXA=
#
# Miscellaneous I2C Chip support
#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
# CONFIG_DS1682 is not set
+# CONFIG_AT24 is not set
- # CONFIG_SENSORS_EEPROM is not set
+ # CONFIG_EEPROM_LEGACY is not set
# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_MAX6875 is not set
^ permalink raw reply
* linux-next: ide tree build failure
From: Stephen Rothwell @ 2009-01-22 1:57 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
Hi Bart,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/ide/ide-eh.c: In function 'do_reset1':
drivers/ide/ide-eh.c:341: error: implicit declaration of function 'ndelay'
The immediate cause is commit 891ac63a7b4e11f13cfdbef59c77d489edd8e0ba
("ide: move error handling code to ide-eh.c").
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
* Re: linux-next: quota tree build failure
From: Stephen Rothwell @ 2009-01-22 4:58 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-next
In-Reply-To: <20090119130147.b2d85e49.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
Hi Jan,
On Mon, 19 Jan 2009 13:01:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> fs/ocfs2/quota_global.c: In function 'ocfs2_dquot_initialize':
> fs/ocfs2/quota_global.c:858: error: implicit declaration of function 'dquot_is_cached'
> fs/ocfs2/quota_global.c: In function 'ocfs2_dquot_drop':
> fs/ocfs2/quota_global.c:962: error: implicit declaration of function 'dquot_drop_locked'
>
> Immediate cause is commit cc33412fb1f11613e20f9dfc2919a77ecd63fbc4
> ("quota: Improve locking"). If you are going to remove an API, you need
> to fix up the callers.
>
> I have dropped the quota tree for today.
Still broken, still dropped.
--
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: driver-core.current tree build failure
From: Stephen Rothwell @ 2009-01-22 6:39 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Inaky Perez-Gonzalez, Linus
[-- Attachment #1: Type: text/plain, Size: 1052 bytes --]
Hi Greg,
Today's linux-next build (powerpc allnoconfig) failed like this:
arch/powerpc/kernel/prom.o: In function `debugfs_create_size_t':
prom.c:(.text+0x0): multiple definition of `debugfs_create_size_t'
arch/powerpc/kernel/irq.o:irq.c:(.text+0x0): first defined here
arch/powerpc/kernel/setup-common.o: In function `debugfs_create_size_t':
setup-common.c:(.text+0x0): multiple definition of `debugfs_create_size_t'
arch/powerpc/kernel/irq.o:irq.c:(.text+0x0): first defined here
Caused by commit c00d80adc67c69d0762390ba513913a44bdebb36 ("debugfs:
introduce stub for debugfs_create_size_t() when DEBUG_FS=n") which added
a stub function to a header file but didn't declare it "static inline".
This has been submitted to Linus stating that it has been in at least one
linux-next tree. It has *not* been in linux-next until today (you do
neither of us a favour by claiming otherwise) and I am reverting it from
there.
--
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: v4l-dvb tree build warning
From: Stephen Rothwell @ 2009-01-22 6:50 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
Hi Mauro,
Today's linux-next build (powerpc allyesconfig) produced these warnings:
drivers/media/video/em28xx/em28xx.h:325: warning: 'ac97_return_record_select' defined but not used
drivers/media/video/em28xx/em28xx.h:325: warning: 'ac97_return_record_select' defined but not used
drivers/media/video/em28xx/em28xx.h:325: warning: 'ac97_return_record_select' defined but not used
drivers/media/video/em28xx/em28xx.h:325: warning: 'ac97_return_record_select' defined but not used
drivers/media/video/em28xx/em28xx.h:325: warning: 'ac97_return_record_select' defined but not used
drivers/media/video/em28xx/em28xx.h:325: warning: 'ac97_return_record_select' defined but not used
Caused by commit 7b388cb489bb551ad7c3b14350a3fb7a8e10e778 ("V4L/DVB (10228): em28xx: fix audio output PCM IN selection").
--
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: Tree for January 22
From: Stephen Rothwell @ 2009-01-22 7:05 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7044 bytes --]
Hi all,
Changes since 20090121:
Undropped trees:
voltage
Dropped trees (temporarily):
quota (build problem)
cpu_alloc (build problem)
audit (difficult conflicts)
I merged the mfd tree immediately after Linus' tree instead of applying
the build fix patch it has.
The driver-core.current tree gained a build failure and had a commit
reverted.
The i2c tree gained a trivial conflict against the pxa tree.
The ide tree gained a build failure and was dropped.
The voltage 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 132 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 mfd/for-next
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 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
CONFLICT (delete/modify): arch/m68knommu/include/asm/Kbuild deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68knommu/include/asm/Kbuild left in tree.
$ git rm -f arch/m68knommu/include/asm/Kbuild
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
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
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
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
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in arch/arm/configs/magician_defconfig
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
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
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
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
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 mm/slob.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 kernel/fork.c
Merging generic-ipi/auto-generic-ipi-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
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
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
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 mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging quilt/staging
Merging scsi-post-merge/master
Created commit 50ecad3: Revert "debugfs: introduce stub for debugfs_create_size_t() when DEBUG_FS=n"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: ide tree build failure
From: Bartlomiej Zolnierkiewicz @ 2009-01-22 13:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20090122125700.bde1fabe.sfr@canb.auug.org.au>
Hi,
On Thursday 22 January 2009, Stephen Rothwell wrote:
> Hi Bart,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> drivers/ide/ide-eh.c: In function 'do_reset1':
> drivers/ide/ide-eh.c:341: error: implicit declaration of function 'ndelay'
>
> The immediate cause is commit 891ac63a7b4e11f13cfdbef59c77d489edd8e0ba
> ("ide: move error handling code to ide-eh.c").
>
> I have dropped the ide tree for today.
Yeah, ide-eh.c should explicitly include <linux/delay.h>
(on x86 it gets pulled indirectly so I haven't noticed it).
Should be fixed now.
Thanks,
Bart
^ permalink raw reply
* Re: linux-next: driver-core.current tree build failure
From: Greg KH @ 2009-01-22 16:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Inaky Perez-Gonzalez, Linus
In-Reply-To: <20090122173901.1828a3a4.sfr@canb.auug.org.au>
On Thu, Jan 22, 2009 at 05:39:01PM +1100, Stephen Rothwell wrote:
> This has been submitted to Linus stating that it has been in at least one
> linux-next tree. It has *not* been in linux-next until today (you do
> neither of us a favour by claiming otherwise) and I am reverting it from
> there.
My apologies, I thought it had been in one linux-next by virtue of when
I had checked it into my tree.
I'll go fix this up and kick Inaky the next time I see him for sending
me a untested patch :)
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for January 22 (staging/rtl8187se)
From: Randy Dunlap @ 2009-01-22 17:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Greg KH
In-Reply-To: <20090122180543.1ab0baa6.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090121:
drivers/staging/rtl8187se/r8180_core.c:5973: error: 'struct net_device' has no member named 'wireless_handlers'
drivers/staging/rtl8187se/r8180_core.c:5982: error: 'struct net_device' has no member named 'wireless_handlers'
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for January 22 (staging/altpcichdma)
From: Randy Dunlap @ 2009-01-22 17:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Greg KH
In-Reply-To: <20090122180543.1ab0baa6.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090121:
drivers/staging/altpciechdma/altpciechdma.c: In function 'ape_sg_to_chdma_table':
drivers/staging/altpciechdma/altpciechdma.c:429: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c:433: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c:449: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c:450: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c: In function 'dma_test':
drivers/staging/altpciechdma/altpciechdma.c:547: warning: assignment makes integer from pointer without a cast
drivers/staging/altpciechdma/altpciechdma.c: In function 'probe':
drivers/staging/altpciechdma/altpciechdma.c:930: warning: label 'err_rev' defined but not used
drivers/staging/altpciechdma/altpciechdma.c:913: warning: label 'err_cdev' defined but not used
drivers/staging/altpciechdma/altpciechdma.c: At top level:
drivers/staging/altpciechdma/altpciechdma.c:415: warning: 'ape_sg_to_chdma_table' defined but not used
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for January 22 (staging/android)
From: Randy Dunlap @ 2009-01-22 17:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Greg KH
In-Reply-To: <20090122180543.1ab0baa6.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090121:
drivers/staging/android/timed_gpio.c: In function 'gpio_enable_show':
drivers/staging/android/timed_gpio.c:52: error: 'ktime_t' has no member named 'tv'
drivers/staging/android/timed_gpio.c:52: error: 'ktime_t' has no member named 'tv'
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for January 22 (staging/rtl8187se)
From: Randy Dunlap @ 2009-01-22 17:18 UTC (permalink / raw)
Cc: Stephen Rothwell, linux-next, LKML, Greg KH
In-Reply-To: <4978A975.60002@oracle.com>
Randy Dunlap wrote:
> Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20090121:
>
>
> drivers/staging/rtl8187se/r8180_core.c:5973: error: 'struct net_device' has no member named 'wireless_handlers'
> drivers/staging/rtl8187se/r8180_core.c:5982: error: 'struct net_device' has no member named 'wireless_handlers'
>
>
and
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c:845: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c:852: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for January 22 (staging/rtl8187se)
From: Randy Dunlap @ 2009-01-22 17:21 UTC (permalink / raw)
To: LKML; +Cc: Stephen Rothwell, linux-next, Greg KH
In-Reply-To: <4978AA7F.5070306@oracle.com>
Randy Dunlap wrote:
> Randy Dunlap wrote:
>> Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20090121:
>>
>> drivers/staging/rtl8187se/r8180_core.c:5973: error: 'struct net_device' has no member named 'wireless_handlers'
>> drivers/staging/rtl8187se/r8180_core.c:5982: error: 'struct net_device' has no member named 'wireless_handlers'
>>
>>
>
> and
> drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c:845: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
> drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c:852: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
>
and
drivers/staging/rtl8187se/r8180_core.c: In function 'rtl8180_shutdown':
drivers/staging/rtl8187se/r8180_core.c:201: error: 'struct net_device' has no member named 'stop'
drivers/staging/rtl8187se/r8180_core.c: In function 'rtl8180_init':
drivers/staging/rtl8187se/r8180_core.c:4584: error: 'struct net_device' has no member named 'get_stats'
drivers/staging/rtl8187se/r8180_core.c: In function 'rtl8180_pci_probe':
drivers/staging/rtl8187se/r8180_core.c:5969: error: 'struct net_device' has no member named 'open'
drivers/staging/rtl8187se/r8180_core.c:5970: error: 'struct net_device' has no member named 'stop'
drivers/staging/rtl8187se/r8180_core.c:5972: error: 'struct net_device' has no member named 'tx_timeout'
drivers/staging/rtl8187se/r8180_core.c:5973: error: 'struct net_device' has no member named 'wireless_handlers'
drivers/staging/rtl8187se/r8180_core.c:5974: error: 'struct net_device' has no member named 'do_ioctl'
drivers/staging/rtl8187se/r8180_core.c:5975: error: 'struct net_device' has no member named 'set_multicast_list'
drivers/staging/rtl8187se/r8180_core.c:5976: error: 'struct net_device' has no member named 'set_mac_address'
drivers/staging/rtl8187se/r8180_core.c:5982: error: 'struct net_device' has no member named 'wireless_handlers'
--
~Randy
^ permalink raw reply
* Re: linux-next: ide tree build failure
From: Stephen Rothwell @ 2009-01-22 22:14 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
In-Reply-To: <200901221422.34187.bzolnier@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
Hi Bart,
On Thu, 22 Jan 2009 14:22:34 +0100 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
>
> Yeah, ide-eh.c should explicitly include <linux/delay.h>
> (on x86 it gets pulled indirectly so I haven't noticed it).
Indeed.
> Should be fixed now.
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: linux-next: Tree for January 22 (staging/android)
From: Greg KH @ 2009-01-22 22:18 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <4978A9D0.2050103@oracle.com>
On Thu, Jan 22, 2009 at 09:16:00AM -0800, Randy Dunlap wrote:
> Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20090121:
>
> drivers/staging/android/timed_gpio.c: In function 'gpio_enable_show':
> drivers/staging/android/timed_gpio.c:52: error: 'ktime_t' has no member named 'tv'
> drivers/staging/android/timed_gpio.c:52: error: 'ktime_t' has no member named 'tv'
Is this due to a change in -next? I see 'tv' as a valid field in
kime_t in Linus's tree.
confused,
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for January 22 (staging/android)
From: Randy Dunlap @ 2009-01-22 22:55 UTC (permalink / raw)
To: Greg KH; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <20090122221849.GA30477@suse.de>
Greg KH wrote:
> On Thu, Jan 22, 2009 at 09:16:00AM -0800, Randy Dunlap wrote:
>> Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20090121:
>> drivers/staging/android/timed_gpio.c: In function 'gpio_enable_show':
>> drivers/staging/android/timed_gpio.c:52: error: 'ktime_t' has no member named 'tv'
>> drivers/staging/android/timed_gpio.c:52: error: 'ktime_t' has no member named 'tv'
>
> Is this due to a change in -next? I see 'tv' as a valid field in
> kime_t in Linus's tree.
>
> confused,
>
> greg k-h
'tv' is a union name, not a field name, right?
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=include/linux/ktime.h;h=ce5983225be4e6430cadbff9cc5cbf448a66e647;hb=HEAD :
46 union ktime {
47 s64 tv64;
48 #if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR)
49 struct {
50 # ifdef __BIG_ENDIAN
51 s32 sec, nsec;
52 # else
53 s32 nsec, sec;
54 # endif
55 } tv;
56 #endif
57 };
58
59 typedef union ktime ktime_t; /* Kill this */
^ permalink raw reply
* linux-next: manual merge of the tip-core tree with the x86 tree
From: Stephen Rothwell @ 2009-01-23 0:54 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Leonardo Potenza, Tejun Heo
Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
arch/x86/kernel/setup_percpu.c between commit
c7f8562a51c2e5dcc1a00a2bdd232b9965ff960d ("x86: fix section mismatch
warnings in kernel/setup_percpu.c") from the x86 tree and commit
1a51e3a0aed18767cf2762e95456ecfeb0bca5e6 ("x86: fold pda into percpu area
on SMP") from the tip-core tree.
The latter just moves code that the former modifies. I fixed it up (see
below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/setup_percpu.c
index e4c32e1,90b8e15..0000000
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@@ -51,7 -77,26 +77,26 @@@ static void __init setup_node_to_cpumas
static inline void setup_node_to_cpumask_map(void) { }
#endif
- #if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_X86_SMP)
+ #ifdef CONFIG_X86_64
+
+ /* correctly size the local cpu masks */
-static void setup_cpu_local_masks(void)
++static void __init setup_cpu_local_masks(void)
+ {
+ alloc_bootmem_cpumask_var(&cpu_initialized_mask);
+ alloc_bootmem_cpumask_var(&cpu_callin_mask);
+ alloc_bootmem_cpumask_var(&cpu_callout_mask);
+ alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
+ }
+
+ #else /* CONFIG_X86_32 */
+
+ static inline void setup_cpu_local_masks(void)
+ {
+ }
+
+ #endif /* CONFIG_X86_32 */
+
+ #ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
/*
* Copy data used in early init routines from the initial arrays to the
* per cpu data areas. These arrays then become expendable and the
^ permalink raw reply
* linux-next: manual merge of the sound tree with the pxa tree
From: Stephen Rothwell @ 2009-01-23 3:01 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, Eric Miao, Ian Molton, Mark Brown
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/e800_wm9712.c between commit
f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
#include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
Toshiba e800") from the sound tree.
Just overlapping context changes. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc sound/soc/pxa/e800_wm9712.c
index ac294c7,78a1770..0000000
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@@ -20,8 -18,12 +18,10 @@@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
- #include <asm/mach-types.h>
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
#include <mach/audio.h>
+ #include <mach/eseries-gpio.h>
+
+ #include <asm/mach-types.h>
#include "../codecs/wm9712.h"
#include "pxa2xx-pcm.h"
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the pxa tree
From: Ian Molton @ 2009-01-23 3:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next, Eric Miao, Mark Brown
In-Reply-To: <20090123140130.eba111dd.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/pxa/e800_wm9712.c between commit
> f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
> #include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
> Toshiba e800") from the sound tree.
>
> Just overlapping context changes. I fixed it up (see below) and can
> carry the fix as necessary.
Looks good. If it needs acking, then
Acked-by: Ian Molton <ian@mnementh.co.uk>
-Ian
^ permalink raw reply
* linux-next: manual merge of the kmemcheck tree with the x86 tree
From: Stephen Rothwell @ 2009-01-23 4:44 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next, Nick Piggin
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/fault.c between commit do_page_fault ("x86: optimise x86's
do_page_fault (C entry point for the page fault path)") from the x86 tree
and commit 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for
kmemcheck") from the kmemcheck tree.
I fixed it up (see below) but it is worth a check. I can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/mm/fault.c
index d3eee74,c73afbb..0000000
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -806,7 -602,16 +807,14 @@@ void __kprobes do_page_fault(struct pt_
/* get the address */
address = read_cr2();
- si_code = SEGV_MAPERR;
-
+ /*
+ * Detect and handle instructions that would cause a page fault for
+ * both a tracked kernel page and a userspace page.
+ */
+ if(kmemcheck_active(regs))
+ kmemcheck_hide(regs);
+
- if (notify_page_fault(regs))
+ if (unlikely(notify_page_fault(regs)))
return;
if (unlikely(kmmio_fault(regs, address)))
return;
@@@ -829,12 -634,16 +837,16 @@@
#else
if (unlikely(address >= TASK_SIZE64)) {
#endif
- if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
- vmalloc_fault(address) >= 0)
- return;
+ if (!(error_code & (PF_RSVD | PF_USER | PF_PROT))) {
+ if (vmalloc_fault(address) >= 0)
+ return;
+
+ if (kmemcheck_fault(regs, address, error_code))
+ return;
+ }
/* Can handle a stale RO->RW TLB */
- if (spurious_fault(address, error_code))
+ if (spurious_fault(error_code, address))
return;
/*
^ 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