* linux-next: Tree for March 12
@ 2009-03-12 6:11 Stephen Rothwell
2009-03-12 8:29 ` Next 12 : arch/powerpc/sysdev/axonram build failure Sachin Sant
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-03-12 6:11 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10642 bytes --]
Hi all,
Changes since 20090311:
The nfs tree gained a build failure so I have used the version from
next-20090311.
The xfs tree still has a build failure and so is still the version from
next-20090306.
The sound tree lost a conflict.
The md tree still has a build failure and so is still the version from
next-20090306.
The ttydev tree gained a conflict against the usb.current tree.
The trivial tree gained a conflict against Linus' tree.
The driver-core tree lost a 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 (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 18 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
Merging xtensa/master
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (delete/modify): block/blktrace.c deleted in tracing/auto-tracing-next and modified in HEAD. Version HEAD of block/blktrace.c left in tree.
CONFLICT (content): Merge conflict in kernel/irq/handle.c
$ git rm -f block/blktrace.c
Applying: tracing: blktrace merge fix
Applying: trace: percpu fixup
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in lib/Makefile
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
$ git reset --hard HEAD^
Merging next-20090311/nfs
Merging xfs/master
$ git reset --hard HEAD^
Merging next-20090306/xfs
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
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/include/asm/timer.h
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/powerpc/kernel/irq.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree.
CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/dcdbas.c
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git rm -f arch/x86/mach-default/setup.c
$ git rm -f arch/x86/mach-voyager/setup.c
Applying: rr: x86 irqaction merge fixup
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
$ git reset --hard HEAD^
Merging next-20090306/md
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.c
CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.h
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/mm/init_32.c
CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
CONFLICT (content): Merge conflict in mm/Makefile
Applying: kmemcheck: arcgh/x86/mm/init.c merge fix
Merging generic-ipi/auto-generic-ipi-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
Applying: proc: remove a new user of proc_dir_entry::owner
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
CONFLICT (add/add): Merge conflict in drivers/scsi/osd/osd_initiator.c
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in init/Kconfig
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
Applying: acpi: update thermal for bus_id removal
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Next 12 : arch/powerpc/sysdev/axonram build failure
2009-03-12 6:11 linux-next: Tree for March 12 Stephen Rothwell
@ 2009-03-12 8:29 ` Sachin Sant
2009-03-12 12:16 ` Michael Ellerman
2009-03-13 10:35 ` Kernel panic on linux-nextMarch 12 Nico -telmich- Schottelius
2009-03-14 13:11 ` linux-next: Tree for March 12 (tty) Bartlomiej Zolnierkiewicz
2 siblings, 1 reply; 9+ messages in thread
From: Sachin Sant @ 2009-03-12 8:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linuxppc-dev
Hi Stephen,
Today's next randconfig build on powerpc fails with
CC [M] arch/powerpc/sysdev/axonram.o
arch/powerpc/sysdev/axonram.c:108: warning: ‘struct request_queue’ declared inside parameter list
arch/powerpc/sysdev/axonram.c:108: warning: its scope is only this definition or declaration, which is probably not what you want
arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_make_request’:
arch/powerpc/sysdev/axonram.c:110: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:118: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:121: error: implicit declaration of function ‘bio_for_each_segment’
arch/powerpc/sysdev/axonram.c:121: error: expected ‘;’ before ‘{’ token
arch/powerpc/sysdev/axonram.c:112: warning: unused variable ‘user_mem’
arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_direct_access’:
arch/powerpc/sysdev/axonram.c:150: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:155: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c: At top level:
arch/powerpc/sysdev/axonram.c:168: error: variable ‘axon_ram_devops’ has initializer but incomplete type
arch/powerpc/sysdev/axonram.c:169: error: unknown field ‘owner’ specified in initializer
arch/powerpc/sysdev/axonram.c:169: warning: excess elements in struct initializer
arch/powerpc/sysdev/axonram.c:169: warning: (near initialization for ‘axon_ram_devops’)
arch/powerpc/sysdev/axonram.c:170: error: unknown field ‘direct_access’ specified in initializer
arch/powerpc/sysdev/axonram.c:171: warning: excess elements in struct initializer
arch/powerpc/sysdev/axonram.c:171: warning: (near initialization for ‘axon_ram_devops’)
arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_probe’:
arch/powerpc/sysdev/axonram.c:228: error: implicit declaration of function ‘alloc_disk’
arch/powerpc/sysdev/axonram.c:228: warning: assignment makes pointer from integer without a cast
arch/powerpc/sysdev/axonram.c:235: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:236: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:237: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:238: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:239: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:241: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:244: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:244: error: implicit declaration of function ‘blk_alloc_queue’
arch/powerpc/sysdev/axonram.c:245: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:251: error: implicit declaration of function ‘set_capacity’
arch/powerpc/sysdev/axonram.c:252: error: implicit declaration of function ‘blk_queue_make_request’
arch/powerpc/sysdev/axonram.c:252: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:253: error: implicit declaration of function ‘blk_queue_hardsect_size’
arch/powerpc/sysdev/axonram.c:253: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:254: error: implicit declaration of function ‘add_disk’
arch/powerpc/sysdev/axonram.c:264: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:279: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:288: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:289: error: implicit declaration of function ‘unregister_blkdev’
arch/powerpc/sysdev/axonram.c:289: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:290: error: dereferencing pointer to incomplete type
arch/powerpc/sysdev/axonram.c:291: error: implicit declaration of function ‘del_gendisk’
arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_init’:
arch/powerpc/sysdev/axonram.c:345: error: implicit declaration of function ‘register_blkdev’
make[1]: *** [arch/powerpc/sysdev/axonram.o] Error 1
make: *** [arch/powerpc/sysdev] Error 2
CONFIG_BLOCK is not set.
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Next 12 : arch/powerpc/sysdev/axonram build failure
2009-03-12 8:29 ` Next 12 : arch/powerpc/sysdev/axonram build failure Sachin Sant
@ 2009-03-12 12:16 ` Michael Ellerman
2009-03-12 13:01 ` Sachin Sant
0 siblings, 1 reply; 9+ messages in thread
From: Michael Ellerman @ 2009-03-12 12:16 UTC (permalink / raw)
To: Sachin Sant; +Cc: Stephen Rothwell, linux-next, linuxppc-dev
On Thu, 2009-03-12 at 13:59 +0530, Sachin Sant wrote:
> Hi Stephen,
>
> Today's next randconfig build on powerpc fails with
>
> CC [M] arch/powerpc/sysdev/axonram.o
> arch/powerpc/sysdev/axonram.c:108: warning: ‘struct request_queue’ declared inside parameter list
> arch/powerpc/sysdev/axonram.c:108: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_make_request’:
<snip>
> arch/powerpc/sysdev/axonram.c:289: error: implicit declaration of function ‘unregister_blkdev’
> arch/powerpc/sysdev/axonram.c:289: error: dereferencing pointer to incomplete type
> arch/powerpc/sysdev/axonram.c:290: error: dereferencing pointer to incomplete type
> arch/powerpc/sysdev/axonram.c:291: error: implicit declaration of function ‘del_gendisk’
> arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_init’:
> arch/powerpc/sysdev/axonram.c:345: error: implicit declaration of function ‘register_blkdev’
> make[1]: *** [arch/powerpc/sysdev/axonram.o] Error 1
> make: *** [arch/powerpc/sysdev] Error 2
>
> CONFIG_BLOCK is not set.
So how about this:
>From 7325aea8244ac83d98cde7a509ec8ab5994cdb0e Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 12 Mar 2009 23:14:58 +1100
Subject: [PATCH] powerpc/cell: axonram depends on BLOCK
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/platforms/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index b4ab372..3fb0851 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -266,7 +266,7 @@ config CPM2
config AXON_RAM
tristate "Axon DDR2 memory device driver"
- depends on PPC_IBM_CELL_BLADE
+ depends on PPC_IBM_CELL_BLADE && BLOCK
default m
help
It registers one block device per Axon's DDR2 memory bank found
--
1.6.1.2
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: Next 12 : arch/powerpc/sysdev/axonram build failure
2009-03-12 12:16 ` Michael Ellerman
@ 2009-03-12 13:01 ` Sachin Sant
0 siblings, 0 replies; 9+ messages in thread
From: Sachin Sant @ 2009-03-12 13:01 UTC (permalink / raw)
To: michael; +Cc: Stephen Rothwell, linuxppc-dev, linux-next
Michael Ellerman wrote:
> So how about this:
>
> >From 7325aea8244ac83d98cde7a509ec8ab5994cdb0e Mon Sep 17 00:00:00 2001
> From: Michael Ellerman <michael@ellerman.id.au>
> Date: Thu, 12 Mar 2009 23:14:58 +1100
> Subject: [PATCH] powerpc/cell: axonram depends on BLOCK
>
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
> ---
>
Yup that works. Thanks.
Regards
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply [flat|nested] 9+ messages in thread
* Kernel panic on linux-nextMarch 12
2009-03-12 6:11 linux-next: Tree for March 12 Stephen Rothwell
2009-03-12 8:29 ` Next 12 : arch/powerpc/sysdev/axonram build failure Sachin Sant
@ 2009-03-13 10:35 ` Nico -telmich- Schottelius
2009-03-14 13:11 ` linux-next: Tree for March 12 (tty) Bartlomiej Zolnierkiewicz
2 siblings, 0 replies; 9+ messages in thread
From: Nico -telmich- Schottelius @ 2009-03-13 10:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
Hello!
On my x200 some acpi stuff seems to kernel panic the notebook.
Screenshot (4.1MiB) can be found at
http://home.schottelius.org/~nico/unix/linux/kernel/next-20090312-x200-kernel-panic.jpeg
Sincerly,
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 #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for March 12 (tty)
2009-03-12 6:11 linux-next: Tree for March 12 Stephen Rothwell
2009-03-12 8:29 ` Next 12 : arch/powerpc/sysdev/axonram build failure Sachin Sant
2009-03-13 10:35 ` Kernel panic on linux-nextMarch 12 Nico -telmich- Schottelius
@ 2009-03-14 13:11 ` Bartlomiej Zolnierkiewicz
2009-03-14 14:19 ` Alan Cox
2009-03-14 16:54 ` Alan Cox
2 siblings, 2 replies; 9+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-03-14 13:11 UTC (permalink / raw)
To: Stephen Rothwell, Alan Cox; +Cc: linux-next, LKML
Hi,
On Thursday 12 March 2009, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090311:
It fails to boot here (both with QEMU and the real hardware):
...
Warning: unable to open an initial console.
Kernel panic - not syncing: Attempted to kill init!
...
I bisected the problem to:
>From 31f8326f981117fc548d292656fa8dbed28bc42b Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Thu, 12 Mar 2009 10:00:15 +1100
Subject: [PATCH] tty-fix-mismatch-in-lookup-han
The lookup methods return NULL or a pointer. The caller expects an ERR_PTR.
It seems to make sense to just use NULL and return -ENODEV here as it keeps
the code simple and clean and the way it always used to work (effectively)
before the restructure
Problem noticed by Jiri Slaby.
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
---
drivers/char/tty_io.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index bc84e12..0cc0c60 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1817,9 +1817,9 @@ got_driver:
/* check whether we're reopening an existing tty */
tty = tty_driver_lookup_tty(driver, inode, index);
- if (IS_ERR(tty)) {
+ if (tty == NULL) {
mutex_unlock(&tty_mutex);
- return PTR_ERR(tty);
+ return -ENODEV;
}
}
--
It seems that fixing IS_ERR() check uncovered some underlying problem
since we are later checking for tty == NULL in __tty_open().
The following patch fixes the issue for me (Alan, feel free to merge
it back into your tty-fix-mismatch-in-lookup-han patch or replace by
a more complete __tty_open() reorganization):
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] tty: fix __tty_open()
On tty_driver_lookup_tty() failure __tty_open() should continue
instead of returning an error, fix it.
Also update tty_driver_lookup_tty() documentation while at it.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/char/tty_io.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
Index: b/drivers/char/tty_io.c
===================================================================
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1205,7 +1205,7 @@ static void tty_line_name(struct tty_dri
* @driver: the driver for the tty
* @idx: the minor number
*
- * Return the tty, if found or ERR_PTR() otherwise.
+ * Return the tty, if found or NULL otherwise.
*
* Locking: tty_mutex must be held. If tty is found, the mutex must
* be held until the 'fast-open' is also done. Will change once we
@@ -1813,16 +1813,10 @@ retry_open:
return -ENODEV;
}
got_driver:
- if (!tty) {
+ if (!tty)
/* check whether we're reopening an existing tty */
tty = tty_driver_lookup_tty(driver, inode, index);
- if (tty == NULL) {
- mutex_unlock(&tty_mutex);
- return -ENODEV;
- }
- }
-
if (tty) {
retval = tty_reopen(tty);
if (retval)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for March 12 (tty)
2009-03-14 13:11 ` linux-next: Tree for March 12 (tty) Bartlomiej Zolnierkiewicz
@ 2009-03-14 14:19 ` Alan Cox
2009-03-14 16:54 ` Alan Cox
1 sibling, 0 replies; 9+ messages in thread
From: Alan Cox @ 2009-03-14 14:19 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Stephen Rothwell, linux-next, LKML
On Sat, 14 Mar 2009 14:11:49 +0100
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
>
> Hi,
>
> On Thursday 12 March 2009, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20090311:
>
> It fails to boot here (both with QEMU and the real hardware):
>
> ...
> Warning: unable to open an initial console.
> Kernel panic - not syncing: Attempted to kill init!
> ...
>
> I bisected the problem to:
>
> From 31f8326f981117fc548d292656fa8dbed28bc42b Mon Sep 17 00:00:00 2001
> From: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Date: Thu, 12 Mar 2009 10:00:15 +110
GAK thanks - I'll sort that mess out monday.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for March 12 (tty)
2009-03-14 13:11 ` linux-next: Tree for March 12 (tty) Bartlomiej Zolnierkiewicz
2009-03-14 14:19 ` Alan Cox
@ 2009-03-14 16:54 ` Alan Cox
2009-03-15 13:42 ` Stephen Rothwell
1 sibling, 1 reply; 9+ messages in thread
From: Alan Cox @ 2009-03-14 16:54 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Stephen Rothwell, linux-next, LKML
Stephen: I've dropped this patch out and pushed a revised tree as well so
it doesn't block other folks.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for March 12 (tty)
2009-03-14 16:54 ` Alan Cox
@ 2009-03-15 13:42 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-03-15 13:42 UTC (permalink / raw)
To: Alan Cox; +Cc: Bartlomiej Zolnierkiewicz, linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
Hi Alan,
On Sat, 14 Mar 2009 16:54:24 +0000 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> Stephen: I've dropped this patch out and pushed a revised tree as well so
> it doesn't block other folks.
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 [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-03-15 13:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-12 6:11 linux-next: Tree for March 12 Stephen Rothwell
2009-03-12 8:29 ` Next 12 : arch/powerpc/sysdev/axonram build failure Sachin Sant
2009-03-12 12:16 ` Michael Ellerman
2009-03-12 13:01 ` Sachin Sant
2009-03-13 10:35 ` Kernel panic on linux-nextMarch 12 Nico -telmich- Schottelius
2009-03-14 13:11 ` linux-next: Tree for March 12 (tty) Bartlomiej Zolnierkiewicz
2009-03-14 14:19 ` Alan Cox
2009-03-14 16:54 ` Alan Cox
2009-03-15 13:42 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).