linux-next: Tree for Feb 18
Hi all,
I have created today's linux-next tree atgit://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
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 allmodconfig for both powerpc and x86_64.
The tree is now tagged with a tag like next-YYYYMMDD and has a localversion-next file which adds "-next-YYYYMMDD" to the kernel revision.
There were a couple of merge conflicts and a couple of build failures and the appropriate people contacted.
We are up to 24 trees, more are welcome.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 3 lines · Stephen Rothwell
We are up to 24 trees, more are welcome.
Kernel-based virtual machine:
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git master
Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
Hi Avi,
Quoted 4 lines · On Mon, 18 Feb 2008 10:14:33 +0200 Avi Kivity <[email protected]> wrote:
Kernel-based virtual machine:
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.gitmaster
Added, thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <[email protected]>
Date: Mon, 18 Feb 2008 19:08:41 +1100
Quoted 2 lines
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
The patch below fixes the allmodconfig build on sparc64 for me.
I notice on the build status page that sparc64 allmodconfig fails in the CODA filesystem bits. I suspect this is some cross-build issue, and even moreso it appears the "u_quad" definition is to blame and the way that gets defined in the CODA fs headers is beyond questionable :-/
Anyways, here is the build fix:
[SPARC64]: Add ide_default_irq() implementation.
include/asm-sparc64/ide.h +5 -0
@@ -24,6 +24,11 @@# endif #endif +static inline int ide_default_irq (unsigned long base) +{ +return 0 ; +} +#define __ide_insl (data_reg, buffer, wcount) \ __ide_insw(data_reg, buffer, (wcount)<<1)#define __ide_outsl (data_reg, buffer, wcount) \
Quoted 27 lines · David Miller
From: Stephen Rothwell <[email protected]>
Date: Mon, 18 Feb 2008 19:08:41 +1100Quoted 2 lines
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.The patch below fixes the allmodconfig build on sparc64 for me.
I notice on the build status page that sparc64 allmodconfig fails in the CODA filesystem bits. I suspect this is some cross-build issue, and even moreso it appears the "
u_quad" definition is to blame and the way that gets defined in the CODA fs headers is beyond questionable :-/Anyways, here is the build fix:
[SPARC64]: Add
ide_default_irq()implementation.Signed-off-by David S. Miller <[email protected]>include/asm-sparc64/ide.h +0
-0@@ -24,6 +24,11 @@# endif
include/asm-sparc64/ide.h line 34
Quoted 10 lines
include/asm-sparc64/ide.h +5
-0#endif +static inline int ide_default_irq (unsigned long base) +{ +return 0 ; +} +#define __ide_insl (data_reg, buffer, wcount) \ __ide_insw(data_reg, buffer, (wcount)<<1)#define __ide_outsl (data_reg, buffer, wcount) \
Thanks, I fixed it in the "guilty" patch to preserve bisectability.
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
* Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.
v2:
* Define ide_default_irq() in ide-probe.c/ns87415.c if not already defined and drop defining ide_default_irq() for CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=n.
[ Thanks to Stephen Rothwell and David Miller for noticing the problem. ]
--- drivers/ide/Kconfig | 3 +++ drivers/ide/ide-probe.c | 4 ++++ drivers/ide/ide.c | 4 ++++ drivers/ide/pci/ns87415.c | 4 ++++ include/asm-alpha/ide.h | 3 --- include/asm-ia64/ide.h | 2 -- include/asm-m32r/ide.h | 2 -- include/asm-mips/mach-generic/ide.h | 2 -- include/asm-powerpc/ide.h | 2 -- include/asm-x86/ide.h | 2 -- include/linux/ide.h | 7 ------- 11 files changed, 15 insertions(+), 20 deletions(-)
drivers/ide/Kconfig +3 -0
@@ -1099,6 +1099,9 @@ config BLK_DEV_IDEDMA config IDE_ARCH_OBSOLETE_INIT def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC +config IDE_ARCH_OBSOLETE_DEFAULTS + def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32 + endif config BLK_DEV_HD_ONLY
drivers/ide/ide-probe.c +4 -0
@@ -1229,6 +1229,10 @@ static void drive_release_dev (struct decomplete (&drive->gendev_rel_comp); } +#ifndef ide_default_irq +#define ide_default_irq (irq) 0 +#endif +static int hwif_init (ide_hwif_t *hwif) {int old_irq;
drivers/ide/ide.c +4 -0
@@ -167,6 +167,10 @@ static void ide_port_init_devices_data(i } } +#ifndef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS +# define ide_default_io_base (index) (0) +# define ide_init_default_irq (base) (0) +#endif /* * init_ide_data() sets reasonable default values into all fields
drivers/ide/pci/ns87415.c +4 -0
@@ -181,6 +181,10 @@ static int ns87415_ide_dma_setup(ide_drireturn 1 ; } +#ifndef ide_default_irq +#define ide_default_irq (irq) 0 +#endif +static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);
include/asm-alpha/ide.h +0 -3
@@ -13,9 +13,6 @@#ifdef __KERNEL__ - -#define IDE_ARCH_OBSOLETE_DEFAULTS -static inline int ide_default_irq (unsigned long base) {switch (base) {
include/asm-ia64/ide.h +0 -2
@@ -16,8 +16,6 @@#include <linux/irq.h> -#define IDE_ARCH_OBSOLETE_DEFAULTS -static inline int ide_default_irq (unsigned long base) {switch (base) {
include/asm-m32r/ide.h +0 -2
@@ -23,8 +23,6 @@# endif #endif -#define IDE_ARCH_OBSOLETE_DEFAULTS -static __inline__int ide_default_irq (unsigned long base) {switch (base) {
include/asm-mips/mach-generic/ide.h +0 -2
@@ -27,8 +27,6 @@# endif #endif -#define IDE_ARCH_OBSOLETE_DEFAULTS -static __inline__int ide_probe_legacy (void ) {#ifdef CONFIG_PCI
include/asm-powerpc/ide.h +0 -2
@@ -31,8 +31,6 @@#include <linux/hdreg.h> #include <linux/ioport.h> -#define IDE_ARCH_OBSOLETE_DEFAULTS -/* FIXME: use ide_platform host driver */ static __inline__int ide_default_irq (unsigned long base) {
include/asm-x86/ide.h +0 -2
@@ -20,8 +20,6 @@# endif #endif -#define IDE_ARCH_OBSOLETE_DEFAULTS -static __inline__int ide_default_irq (unsigned long base) {switch (base) {
include/linux/ide.h +0 -7
@@ -194,13 +194,6 @@ static inline void ide_std_init_ports(hw#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS#endif -/* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */ -#ifndef IDE_ARCH_OBSOLETE_DEFAULTS -# define ide_default_io_base (index) (0) -# define ide_default_irq (base) (0) -# define ide_init_default_irq (base) (0) -#endif -/* Currently only m68k, apus and m8xx need it */ #ifndef IDE_ARCH_ACK_INTR # define ide_ack_intr (hwif) (1)