* [PATCH -next] eeepc: needs to depend on INPUT
From: Randy Dunlap @ 2009-02-19 17:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Andrew Morton, Corentin Chary
In-Reply-To: <20090220002832.cad00fcd.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
EEEPC_LAPTOP needs to depend on INPUT to fix build errors that
can happen when EEEPC_LAPTOP=y and INPUT=m:
drivers/built-in.o: In function `eeepc_hotk_add':
eeepc-laptop.c:(.text+0x14f403): undefined reference to `input_allocate_device'
eeepc-laptop.c:(.text+0x14f7a4): undefined reference to `input_register_device'
eeepc-laptop.c:(.text+0x14f7c8): undefined reference to `input_free_device'
drivers/built-in.o: In function `eeepc_input_exit':
eeepc-laptop.c:(.text+0x14f9d7): undefined reference to `input_unregister_device'
drivers/built-in.o: In function `eeepc_hotk_notify':
eeepc-laptop.c:(.text+0x14faf6): undefined reference to `input_event'
eeepc-laptop.c:(.text+0x14fb0c): undefined reference to `input_event'
eeepc-laptop.c:(.text+0x14fb32): undefined reference to `input_event'
eeepc-laptop.c:(.text+0x14fb48): undefined reference to `input_event'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20090219.orig/drivers/platform/x86/Kconfig
+++ linux-next-20090219/drivers/platform/x86/Kconfig
@@ -313,7 +313,7 @@ config INTEL_MENLOW
config EEEPC_LAPTOP
tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
- depends on ACPI
+ depends on ACPI && INPUT
depends on EXPERIMENTAL
select BACKLIGHT_CLASS_DEVICE
select HWMON
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Mike Frysinger @ 2009-02-19 17:14 UTC (permalink / raw)
To: Rusty Russell
Cc: Stephen Rothwell, Sachin P. Sant, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <200902192210.10368.rusty@rustcorp.com.au>
On Thu, Feb 19, 2009 at 06:40, Rusty Russell wrote:
> On Thursday 19 February 2009 12:25:13 Mike Frysinger wrote:
>> > +char *strncpy(char *dest, const char *src, size_t n);
>> > #define strncpy __inline_strncpy
>> > #include <asm/string.h>
>> > #undef strncpy
>>
>> size_t is not a builtin type so there needs to be a linux/types.h
>> include right above these two prototypes. then things build up fine
>> for me.
>
> OK, this time for sure!
>
>
> blackfin: allow usage of string functions in linux/string.h
>
> In introducing a trivial "strstarts()" function in linux/string.h, we
> hit the following error on blackfin:
>
> file included from include/linux/bitmap.h:9,
> from include/linux/nodemask.h:90,
> from include/linux/mmzone.h:17,
> from include/linux/gfp.h:5,
> from include/linux/kmod.h:23,
> from include/linux/module.h:14,
> from arch/blackfin/lib/strncmp.c:14:
> include/linux/string.h: In function 'strstarts':
> include/linux/string.h:124: error: implicit declaration of function 'strncmp'
>
> Because when including asm/string.h from arch/blackfin/lib/strncmp.c,
> we don't declare the string op we are about to define, and
> linux/string.h barfs.
>
> The fix is to declare the function whose definition we steal via the
> #define trick. I do this for all of them, so this won't bite us in
> future.
>
> Reported-by: linux-next
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Tested-by: Mike Frysinger <vapier@gentoo.org>
-mike
^ permalink raw reply
* next-20090219: IMA: kernel BUG at include/linux/scatterlist.h:65
From: Alexander Beregalov @ 2009-02-19 14:51 UTC (permalink / raw)
To: zohar, linux-next@vger.kernel.org, LKML
Hi
kernel BUG at include/linux/scatterlist.h:65!
invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
last sysfs file:
CPU 2
Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.29-rc5-next-20090219 #5 PowerEdge 1950
RIP: 0010:[<ffffffff8045ec70>] [<ffffffff8045ec70>] ima_calc_hash+0xc0/0x160
RSP: 0018:ffff88007f46bc40 EFLAGS: 00010286
RAX: ffffe200032c45e8 RBX: 00000000fffffff4 RCX: 0000000087654321
RDX: 0000000000000002 RSI: 0000000000000001 RDI: ffff88007cf71048
RBP: ffff88007f46bcd0 R08: 0000000000000000 R09: 0000000000000163
R10: ffff88007f4707a8 R11: 0000000000000000 R12: ffff88007cf71048
R13: 0000000000001000 R14: 0000000000000000 R15: 0000000000009d98
FS: 0000000000000000(0000) GS:ffff8800051ac000(0000) knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000000000 CR3: 0000000000201000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process swapper (pid: 1, threadinfo ffff88007f46a000, task ffff88007f470000)
Stack:
ffffffff8045e49e 0000004800000246 ffff88007cfbc3b8 ffff88007c853980
ffffffff8045e49e 0000000000000002 ffff88007cfbc440 ffff88007cfbc418
2222222222222222 2222222222222222 ffff88007d878b88 2222222200000000
Call Trace:
[<ffffffff8045e49e>] ? process_measurement+0x9e/0x110
[<ffffffff8045e49e>] ? process_measurement+0x9e/0x110
[<ffffffff8045ed6f>] ima_collect_measurement+0x5f/0x70
[<ffffffff8045e4e7>] process_measurement+0xe7/0x110
[<ffffffff8045e531>] ima_bprm_check+0x21/0x30
[<ffffffff802d0246>] search_binary_handler+0x26/0x320
[<ffffffff802d0792>] do_execve+0x252/0x2c0
[<ffffffff802099c9>] sys_execve+0x49/0x80
[<ffffffff8020ccd8>] kernel_execve+0x68/0xd0
[<ffffffff80209232>] ? init_post+0xb2/0x1b0
[<ffffffff8020cc5a>] ? child_rip+0xa/0x20
[<ffffffff80235ec9>] ? finish_task_switch+0x89/0x110
[<ffffffff80656006>] ? _spin_unlock_irq+0x36/0x60
[<ffffffff8020c640>] ? restore_args+0x0/0x30
[<ffffffff8020cc50>] ? child_rip+0x0/0x20
Code: 89 e7 e8 d4 c6 dc ff 48 b9 00 00 00 00 00 e2 ff ff 48 c1 e8
0c 48 8b 55 98 48 6b c0 68 48 01 c8 b9 21 43 65 87 48 39 4d 90 74 30 <0f> 0b eb
fe 4c 89 e7 44 89 eb e8 f1 66 e6 ff 48 8b 7d c0 48 89
RIP [<ffffffff8045ec70>] ima_calc_hash+0xc0/0x160
RSP <ffff88007f46bc40>
---[ end trace 0003b39833c42ede ]---
<..>
Kernel panic - not syncing: Attempted to kill init!
^ permalink raw reply
* linux-next: Tree for February 19
From: Stephen Rothwell @ 2009-02-19 13:28 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8173 bytes --]
Hi all,
Changes since 20090218:
The kvm tree lost its conflict.
The net tree gained 2 conflicts against the wireless-current tree.
The wireless tree gained a conflicts against the wireless-current tree.
The cpufreq tree lost its conflict.
The rr tree lost a conflict.
----------------------------------------------------------------------------
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 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 (content): Merge conflict in arch/arm/mach-pxa/dma.c
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
Merging ftrace/auto-ftrace-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
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
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
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
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
CONFLICT (delete/modify): drivers/net/wireless/orinoco/orinoco.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/wireless/orinoco/orinoco.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/p54/p54common.c
$ git rm -f drivers/net/wireless/orinoco/orinoco.c
Applying: orinoco merge fixup
Merging mtd/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/main.c
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
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
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/include/asm/es7000/apic.h
$ git rm -f arch/x86/include/asm/numaq/apic.h
Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/Makefile
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
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
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
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 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 include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Rusty Russell @ 2009-02-19 11:48 UTC (permalink / raw)
To: Russell King
Cc: Mike Frysinger, Stephen Rothwell, Sachin P. Sant, linux-s390,
linux-next, LKML, schwidefsky, heiko.carstens
In-Reply-To: <20090219095150.GA5808@flint.arm.linux.org.uk>
On Thursday 19 February 2009 20:21:50 Russell King wrote:
> On Thu, Feb 19, 2009 at 10:45:25AM +1030, Rusty Russell wrote:
> > Subject: arm: allow usage of string functions in linux/string.h
>
> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
>
> I guess this should go in with the change which caused the breakage.
Well, feel free to queue it yourself too, but now you've acked it I've put it
in my queue ahead of the strstarts patch.
Thanks,
Rusty.
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Rusty Russell @ 2009-02-19 11:40 UTC (permalink / raw)
To: Mike Frysinger
Cc: Stephen Rothwell, Sachin P. Sant, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <8bd0f97a0902181755y5a5f6760s6e266c87906e6dca@mail.gmail.com>
On Thursday 19 February 2009 12:25:13 Mike Frysinger wrote:
> > +char *strncpy(char *dest, const char *src, size_t n);
> > #define strncpy __inline_strncpy
> > #include <asm/string.h>
> > #undef strncpy
>
> size_t is not a builtin type so there needs to be a linux/types.h
> include right above these two prototypes. then things build up fine
> for me.
OK, this time for sure!
blackfin: allow usage of string functions in linux/string.h
In introducing a trivial "strstarts()" function in linux/string.h, we
hit the following error on blackfin:
file included from include/linux/bitmap.h:9,
from include/linux/nodemask.h:90,
from include/linux/mmzone.h:17,
from include/linux/gfp.h:5,
from include/linux/kmod.h:23,
from include/linux/module.h:14,
from arch/blackfin/lib/strncmp.c:14:
include/linux/string.h: In function 'strstarts':
include/linux/string.h:124: error: implicit declaration of function 'strncmp'
Because when including asm/string.h from arch/blackfin/lib/strncmp.c,
we don't declare the string op we are about to define, and
linux/string.h barfs.
The fix is to declare the function whose definition we steal via the
#define trick. I do this for all of them, so this won't bite us in
future.
Reported-by: linux-next
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
arch/blackfin/lib/strcmp.c | 1 +
arch/blackfin/lib/strcpy.c | 1 +
arch/blackfin/lib/strncmp.c | 1 +
arch/blackfin/lib/strncpy.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/blackfin/lib/strcmp.c b/arch/blackfin/lib/strcmp.c
--- a/arch/blackfin/lib/strcmp.c
+++ b/arch/blackfin/lib/strcmp.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+int strcmp(const char *dest, const char *src);
#define strcmp __inline_strcmp
#include <asm/string.h>
#undef strcmp
diff --git a/arch/blackfin/lib/strcpy.c b/arch/blackfin/lib/strcpy.c
--- a/arch/blackfin/lib/strcpy.c
+++ b/arch/blackfin/lib/strcpy.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+char *strcpy(char *dest, const char *src);
#define strcpy __inline_strcpy
#include <asm/string.h>
#undef strcpy
diff --git a/arch/blackfin/lib/strncmp.c b/arch/blackfin/lib/strncmp.c
--- a/arch/blackfin/lib/strncmp.c
+++ b/arch/blackfin/lib/strncmp.c
@@ -6,6 +6,8 @@
* Licensed under the GPL-2 or later.
*/
+#include <linux/types.h>
+int strncmp(const char *cs, const char *ct, size_t count);
#define strncmp __inline_strncmp
#include <asm/string.h>
#undef strncmp
diff --git a/arch/blackfin/lib/strncpy.c b/arch/blackfin/lib/strncpy.c
--- a/arch/blackfin/lib/strncpy.c
+++ b/arch/blackfin/lib/strncpy.c
@@ -6,6 +6,8 @@
* Licensed under the GPL-2 or later.
*/
+#include <linux/types.h>
+char *strncpy(char *dest, const char *src, size_t n);
#define strncpy __inline_strncpy
#include <asm/string.h>
#undef strncpy
^ permalink raw reply
* Re: [PATCH v2] module: fix build for CONFIG_SYSFS=n
From: Rusty Russell @ 2009-02-19 10:50 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML
In-Reply-To: <20090218191529.GC8889@elte.hu>
On Thursday 19 February 2009 05:45:29 Ingo Molnar wrote:
>
> * Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> > > Is destroy_params() dependent on SYSFS? If yes then it would be
> >
> > Yes.
> >
> > > far cleaner if there was a NOP destroy_params() inline for the
> > > !SYSFS case.
...
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Fix this build error when CONFIG_SYSFS=n:
Thanks for the find Randy. I chose to put it in the header. People who turn
off SYSFS probably appreciate a few bytes saved:
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -139,7 +139,14 @@ extern int parse_args(const char *name,
int (*unknown)(char *param, char *val));
/* Called by module remove. */
+#ifdef CONFIG_SYSFS
extern void destroy_params(const struct kernel_param *params, unsigned num);
+#else
+static inline void destroy_params(const struct kernel_param *params,
+ unsigned num)
+{
+}
+#endif /* !CONFIG_SYSFS */
/* All the helper functions */
/* The macros to do compile-time type checking stolen from Jakub
Cheers,
Rusty.
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Russell King @ 2009-02-19 9:51 UTC (permalink / raw)
To: Rusty Russell
Cc: Mike Frysinger, Stephen Rothwell, Sachin P. Sant, linux-s390,
linux-next, LKML, schwidefsky, heiko.carstens
In-Reply-To: <200902191045.25878.rusty@rustcorp.com.au>
On Thu, Feb 19, 2009 at 10:45:25AM +1030, Rusty Russell wrote:
> Subject: arm: allow usage of string functions in linux/string.h
>
> In introducing a trivial "strstarts()" function in linux/string.h, we
> hit:
>
> arch/arm/boot/compressed/misc.o: In function `strstarts':
> misc.c:(.text+0x368): undefined reference to `strlen'
> misc.c:(.text+0x378): undefined reference to `strncmp'
>
> This is because of "CFLAGS_misc.o := -Dstatic=" in the Makefile.
> "static inline strstarts(...)" becomes non-inline, and refers to the
> other string ops.
>
> The simplest workaround is to include asm/string.h. This makes sense
> anyway, since lib/string.c won't be linked against this so we can't
> use those functions anyway.
>
> Compile tested here.
>
> Reported-by: linux-next
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
I guess this should go in with the change which caused the breakage.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* Re: [PATCH v2] module: fix build for CONFIG_SYSFS=n
From: Takashi Iwai @ 2009-02-19 7:32 UTC (permalink / raw)
To: Randy Dunlap
Cc: Ingo Molnar, Stephen Rothwell, linux-next, LKML, Rusty Russell
In-Reply-To: <499C54E8.7060004@oracle.com>
At Wed, 18 Feb 2009 10:35:20 -0800,
Randy Dunlap wrote:
>
> > Is destroy_params() dependent on SYSFS? If yes then it would be
>
> Yes.
>
> > far cleaner if there was a NOP destroy_params() inline for the
> > !SYSFS case.
>
>
>
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix this build error when CONFIG_SYSFS=n:
>
> kernel/built-in.o: In function `free_module':
> module.c:(.text+0x4f8a2): undefined reference to `destroy_params'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Rusty Russell <rusty@rustcorp.com.au>
> ---
> kernel/params.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> --- linux-next-20090218.orig/kernel/params.c
> +++ linux-next-20090218/kernel/params.c
> @@ -761,6 +761,12 @@ static int __init param_sysfs_init(void)
> }
> subsys_initcall(param_sysfs_init);
>
> +#else /* !CONFIG_SYSFS */
> +
> +inline void destroy_params(const struct kernel_param *params, unsigned num)
> +{
> +}
Just wondering whether any need to be (external) inline at this place,
supposing it just to be called from other files.
If inlining, isn't it better in include/linux/moduleparam.h?
thanks,
Takashi
^ permalink raw reply
* linux-next: manual merge of the wireless tree with the wireless-current tree
From: Stephen Rothwell @ 2009-02-19 5:27 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, Bob Copeland, Vasanthakumar Thiagarajan
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath9k/main.c between commit
11cb2b00a5f8654102e34df3cfa44992b9c2fc8e ("ath9k: Fix panic upon attach
failure") from the wireless-current tree and commit ath_attach ("ath9k:
move common regulatory code out of if() branches") from the wireless tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/wireless/ath9k/main.c
index 7d7537e,1b2c9af..0000000
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@@ -1566,7 -1569,8 +1570,8 @@@ bad
int ath_attach(u16 devid, struct ath_softc *sc)
{
struct ieee80211_hw *hw = sc->hw;
+ const struct ieee80211_regdomain *regd;
- int error = 0;
+ int error = 0, i;
DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n");
^ permalink raw reply
* linux-next: manual merge of the net tree with the wireless-current tree
From: Stephen Rothwell @ 2009-02-19 5:23 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, David Kilroy, Andrey Borzenkov, John W. Linville
Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/orinoco/orinoco.c between commit
f6af197dc4883176e5ba001b27efc02baaef56be ("orinoco: do not resgister NULL
pm_notifier function") from the wireless-current tree and commit
47445cb95015bef0d54ca799f31e454797378a71 ("orinoco: Rename orinoco.c")
from the net tree.
I removed orinoco.c and patched main.c (with the patch below) to match
John's supplied test merge. I can carry this for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git b/drivers/net/wireless/orinoco/main.c a/drivers/net/wireless/orinoco/main.c
index 54dfc45..e9b1db7 100644
--- b/drivers/net/wireless/orinoco/main.c
+++ a/drivers/net/wireless/orinoco/main.c
@@ -2076,8 +2076,20 @@ static int orinoco_pm_notifier(struct notifier_block *notifier,
return NOTIFY_DONE;
}
+
+static void orinoco_register_pm_notifier(struct orinoco_private *priv)
+{
+ priv->pm_notifier.notifier_call = orinoco_pm_notifier;
+ register_pm_notifier(&priv->pm_notifier);
+}
+
+static void orinoco_unregister_pm_notifier(struct orinoco_private *priv)
+{
+ unregister_pm_notifier(&priv->pm_notifier);
+}
#else /* !PM_SLEEP || HERMES_CACHE_FW_ON_INIT */
-#define orinoco_pm_notifier NULL
+#define orinoco_register_pm_notifier(priv) do { } while(0)
+#define orinoco_unregister_pm_notifier(priv) do { } while(0)
#endif
/********************************************************************/
@@ -2572,8 +2584,7 @@ struct net_device
priv->cached_fw = NULL;
/* Register PM notifiers */
- priv->pm_notifier.notifier_call = orinoco_pm_notifier;
- register_pm_notifier(&priv->pm_notifier);
+ orinoco_register_pm_notifier(priv);
return dev;
}
@@ -2598,7 +2609,7 @@ void free_orinocodev(struct net_device *dev)
kfree(rx_data);
}
- unregister_pm_notifier(&priv->pm_notifier);
+ orinoco_unregister_pm_notifier(priv);
orinoco_uncache_fw(priv);
priv->wpa_ie_len = 0;
^ permalink raw reply related
* linux-next: manual merge of the net tree with the wireless-current tree
From: Stephen Rothwell @ 2009-02-19 5:23 UTC (permalink / raw)
To: David Miller
Cc: linux-next, Christian Lamparter, John W. Linville, Roel Kluin
Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/p54/p54common.c between commit
9de1643b4d59b416568bae04dbf67a374360765b ("p54: misplaced parentheses")
from the wireless-current tree and commit
51eed9923d98477e7f7473edd60d876d1cecc8c5 ("p54: implement FIF_OTHER_BSS
filter setting") from the net tree.
I fixed it up as suggested in John's merge test (see below) and can carry
the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/wireless/p54/p54common.c
index 530daee,45c2e7a..0000000
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@@ -1932,8 -2211,9 +2211,9 @@@ static void p54_configure_filter(struc
struct p54_common *priv = dev->priv;
*total_flags &= FIF_PROMISC_IN_BSS |
+ FIF_OTHER_BSS |
- (*total_flags & FIF_PROMISC_IN_BSS) ?
- FIF_FCSFAIL : 0;
+ (*total_flags & FIF_PROMISC_IN_BSS ?
+ FIF_FCSFAIL : 0);
priv->filter_flags = *total_flags;
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Sachin P. Sant @ 2009-02-19 5:20 UTC (permalink / raw)
To: Rusty Russell
Cc: Mike Frysinger, Stephen Rothwell, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <200902190913.27653.rusty@rustcorp.com.au>
Rusty Russell wrote:
> On Thursday 19 February 2009 03:40:59 Mike Frysinger wrote:
>
>> On Wed, Feb 18, 2009 at 06:45, Stephen Rothwell wrote:
>>
>>> That would be a side effect of commit 43a47c6ca0e0b5479ae316e188a28b7e625d41e5 ("misc:strstarts") from the rr tree. Rusty cc'd.
>>>
>> breaks all Blackfin ports as well:
>>
>
> My first reaction was WTF? My second was, how did our string code become
> such a catastrophe?
>
> Sorry, I had no idea what a mess I was wading into.
>
> Here's the s390 fix:
>
Thanks Rusty. That fixes the issue.
Regards
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* Re: coming conflicts between wireless-2.6 and wireless-next-2.6
From: Stephen Rothwell @ 2009-02-19 5:01 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next
In-Reply-To: <20090218030246.GA551@tuxdriver.com>
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
Hi John,
On Tue, 17 Feb 2009 22:02:46 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> There are several conflicts in the latest rounds of the wireless trees.
> Most of them are simple. One of them involves transporting some
> changes from "orinoco: do not resgister NULL pm_notifier function"
> between drivers/net/orinoco/orinoco.c (which no longer exists in -next)
> over to drivers/net/orinoco/main.c.
>
> I have an example 'merge-test' branch in wireless-next-2.6 to show
> how I think the conflicts should be resolved -- enjoy! :-)
Thanks for the heads up and your merge-test branch.
--
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: [s390] next Feb 18: defconfig build break
From: Mike Frysinger @ 2009-02-19 1:55 UTC (permalink / raw)
To: Rusty Russell
Cc: Stephen Rothwell, Sachin P. Sant, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <200902190929.42044.rusty@rustcorp.com.au>
On Wed, Feb 18, 2009 at 17:59, Rusty Russell wrote:
> On Thursday 19 February 2009 03:40:59 Mike Frysinger wrote:
>> breaks all Blackfin ports as well:
>> In file included from include/linux/bitmap.h:9,
>> from include/linux/nodemask.h:90,
>> from include/linux/mmzone.h:17,
>> from include/linux/gfp.h:5,
>> from include/linux/kmod.h:23,
>> from include/linux/module.h:14,
>> from arch/blackfin/lib/strncmp.c:14:
>> include/linux/string.h: In function 'strstarts':
>> include/linux/string.h:124: error: implicit declaration of function 'strncmp'
>> make[1]: *** [arch/blackfin/lib/strncmp.o] Error 1
>> make: *** [arch/blackfin/lib] Error 2
>
> I don't have a blackfin cross compiler, but I think this is the right
> fix:
np ... fix is almost correct :)
> --- a/arch/blackfin/lib/strncmp.c
> +++ b/arch/blackfin/lib/strncmp.c
> @@ -6,6 +6,7 @@
> * Licensed under the GPL-2 or later.
> */
>
> +int strncmp(const char *cs, const char *ct, size_t count);
> #define strncmp __inline_strncmp
> #include <asm/string.h>
> #undef strncmp
> diff --git a/arch/blackfin/lib/strncpy.c b/arch/blackfin/lib/strncpy.c
> --- a/arch/blackfin/lib/strncpy.c
> +++ b/arch/blackfin/lib/strncpy.c
> @@ -6,6 +6,7 @@
> * Licensed under the GPL-2 or later.
> */
>
> +char *strncpy(char *dest, const char *src, size_t n);
> #define strncpy __inline_strncpy
> #include <asm/string.h>
> #undef strncpy
size_t is not a builtin type so there needs to be a linux/types.h
include right above these two prototypes. then things build up fine
for me.
thanks!
-mike
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Rusty Russell @ 2009-02-19 0:15 UTC (permalink / raw)
To: Mike Frysinger
Cc: Stephen Rothwell, Sachin P. Sant, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens, rmk
In-Reply-To: <8bd0f97a0902180910wafd35ceo47aeb9f3cc6733f3@mail.gmail.com>
On Thursday 19 February 2009 03:40:59 Mike Frysinger wrote:
> On Wed, Feb 18, 2009 at 06:45, Stephen Rothwell wrote:
> > That would be a side effect of commit 43a47c6ca0e0b5479ae316e188a28b7e625d41e5 ("misc:strstarts") from the rr tree. Rusty cc'd.
>
> breaks all Blackfin ports as well:
And arm!
Subject: arm: allow usage of string functions in linux/string.h
In introducing a trivial "strstarts()" function in linux/string.h, we
hit:
arch/arm/boot/compressed/misc.o: In function `strstarts':
misc.c:(.text+0x368): undefined reference to `strlen'
misc.c:(.text+0x378): undefined reference to `strncmp'
This is because of "CFLAGS_misc.o := -Dstatic=" in the Makefile.
"static inline strstarts(...)" becomes non-inline, and refers to the
other string ops.
The simplest workaround is to include asm/string.h. This makes sense
anyway, since lib/string.c won't be linked against this so we can't
use those functions anyway.
Compile tested here.
Reported-by: linux-next
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -18,7 +18,10 @@
unsigned int __machine_arch_type;
-#include <linux/string.h>
+#include <linux/compiler.h> /* for inline */
+#include <linux/types.h> /* for size_t */
+#include <linux/stddef.h> /* for NULL */
+#include <asm/string.h>
#ifdef STANDALONE_DEBUG
#define putstr printf
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Rusty Russell @ 2009-02-18 22:59 UTC (permalink / raw)
To: Mike Frysinger
Cc: Stephen Rothwell, Sachin P. Sant, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <8bd0f97a0902180910wafd35ceo47aeb9f3cc6733f3@mail.gmail.com>
On Thursday 19 February 2009 03:40:59 Mike Frysinger wrote:
> breaks all Blackfin ports as well:
> In file included from include/linux/bitmap.h:9,
> from include/linux/nodemask.h:90,
> from include/linux/mmzone.h:17,
> from include/linux/gfp.h:5,
> from include/linux/kmod.h:23,
> from include/linux/module.h:14,
> from arch/blackfin/lib/strncmp.c:14:
> include/linux/string.h: In function 'strstarts':
> include/linux/string.h:124: error: implicit declaration of function 'strncmp'
> make[1]: *** [arch/blackfin/lib/strncmp.o] Error 1
> make: *** [arch/blackfin/lib] Error 2
> -mike
Hi Mike,
I don't have a blackfin cross compiler, but I think this is the right
fix:
Subject: blackfin: allow usage of string functions in linux/string.h
In introducing a trivial "strstarts()" function in linux/string.h, we
hit the following error on blackfin:
file included from include/linux/bitmap.h:9,
from include/linux/nodemask.h:90,
from include/linux/mmzone.h:17,
from include/linux/gfp.h:5,
from include/linux/kmod.h:23,
from include/linux/module.h:14,
from arch/blackfin/lib/strncmp.c:14:
include/linux/string.h: In function 'strstarts':
include/linux/string.h:124: error: implicit declaration of function 'strncmp'
Because when including asm/string.h from arch/blackfin/lib/strncmp.c,
we don't declare the string op we are about to define, and
linux/string.h barfs.
The fix is to declare the function whose definition we steal via the
#define trick. I do this for all of them, so this won't bite us in
future.
Reported-by: linux-next
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/arch/blackfin/lib/strcmp.c b/arch/blackfin/lib/strcmp.c
--- a/arch/blackfin/lib/strcmp.c
+++ b/arch/blackfin/lib/strcmp.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+int strcmp(const char *dest, const char *src);
#define strcmp __inline_strcmp
#include <asm/string.h>
#undef strcmp
diff --git a/arch/blackfin/lib/strcpy.c b/arch/blackfin/lib/strcpy.c
--- a/arch/blackfin/lib/strcpy.c
+++ b/arch/blackfin/lib/strcpy.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+char *strcpy(char *dest, const char *src);
#define strcpy __inline_strcpy
#include <asm/string.h>
#undef strcpy
diff --git a/arch/blackfin/lib/strncmp.c b/arch/blackfin/lib/strncmp.c
--- a/arch/blackfin/lib/strncmp.c
+++ b/arch/blackfin/lib/strncmp.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+int strncmp(const char *cs, const char *ct, size_t count);
#define strncmp __inline_strncmp
#include <asm/string.h>
#undef strncmp
diff --git a/arch/blackfin/lib/strncpy.c b/arch/blackfin/lib/strncpy.c
--- a/arch/blackfin/lib/strncpy.c
+++ b/arch/blackfin/lib/strncpy.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+char *strncpy(char *dest, const char *src, size_t n);
#define strncpy __inline_strncpy
#include <asm/string.h>
#undef strncpy
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Rusty Russell @ 2009-02-18 22:43 UTC (permalink / raw)
To: Mike Frysinger
Cc: Stephen Rothwell, Sachin P. Sant, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <8bd0f97a0902180910wafd35ceo47aeb9f3cc6733f3@mail.gmail.com>
On Thursday 19 February 2009 03:40:59 Mike Frysinger wrote:
> On Wed, Feb 18, 2009 at 06:45, Stephen Rothwell wrote:
> > That would be a side effect of commit 43a47c6ca0e0b5479ae316e188a28b7e625d41e5 ("misc:strstarts") from the rr tree. Rusty cc'd.
>
> breaks all Blackfin ports as well:
My first reaction was WTF? My second was, how did our string code become
such a catastrophe?
Sorry, I had no idea what a mess I was wading into.
Here's the s390 fix:
Subject: s390: allow usage of string functions in linux/string.h
In introducing a trivial "strstarts()" function in linux/string.h, we
hit the following error on s390:
In file included from include/linux/bitmap.h:8,
from include/linux/cpumask.h:142,
from include/linux/smp.h:12,
from /home/rusty/devel/kernel/patches/linux-2.6/arch/s390/include/asm/spinlock.h:14,
from include/linux/spinlock.h:88,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from arch/s390/lib/string.c:13:
include/linux/string.h: In function 'strstarts':
include/linux/string.h:124: error: implicit declaration of function 'strlen'
include/linux/string.h:124: warning: incompatible implicit declaration of built-in function 'strlen'
Because when including asm/string.h from arch/s390/lib/string.c we
don't declare the string ops we are about to define, and
linux/string.h barfs.
The fix is to declare them in this IN_ARCH_STRING_C case, but in
general I wonder if there's a neater fix.
Reported-by: linux-next
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h
--- a/arch/s390/include/asm/string.h
+++ b/arch/s390/include/asm/string.h
@@ -135,7 +135,13 @@ static inline size_t strnlen(const char
: "+a" (end), "+a" (tmp) : "d" (r0) : "cc");
return end - s;
}
-
+#else /* IN_ARCH_STRING_C */
+void *memchr(const void * s, int c, size_t n);
+void *memscan(void *s, int c, size_t n);
+char *strcat(char *dst, const char *src);
+char *strcpy(char *dst, const char *src);
+size_t strlen(const char *s);
+size_t strnlen(const char * s, size_t n);
#endif /* !IN_ARCH_STRING_C */
#endif /* __KERNEL__ */
^ permalink raw reply
* Re: [PATCH v2] module: fix build for CONFIG_SYSFS=n
From: Ingo Molnar @ 2009-02-18 19:15 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, Rusty Russell
In-Reply-To: <499C54E8.7060004@oracle.com>
* Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > Is destroy_params() dependent on SYSFS? If yes then it would be
>
> Yes.
>
> > far cleaner if there was a NOP destroy_params() inline for the
> > !SYSFS case.
>
>
>
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix this build error when CONFIG_SYSFS=n:
>
> kernel/built-in.o: In function `free_module':
> module.c:(.text+0x4f8a2): undefined reference to `destroy_params'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Rusty Russell <rusty@rustcorp.com.au>
> ---
> kernel/params.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> --- linux-next-20090218.orig/kernel/params.c
> +++ linux-next-20090218/kernel/params.c
> @@ -761,6 +761,12 @@ static int __init param_sysfs_init(void)
> }
> subsys_initcall(param_sysfs_init);
>
> +#else /* !CONFIG_SYSFS */
> +
> +inline void destroy_params(const struct kernel_param *params, unsigned num)
> +{
> +}
> +
> #endif /* CONFIG_SYSFS */
thanks!
Acked-by: Ingo Molnar <mingo@elte.hu>
Ingo
^ permalink raw reply
* Re: linux-next: Tree for February 12 (ide)
From: Bartlomiej Zolnierkiewicz @ 2009-02-18 18:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, linux-ide, Sergei Shtylyov
In-Reply-To: <499C42A8.7060003@oracle.com>
On Wednesday 18 February 2009, Randy Dunlap wrote:
> Bartlomiej Zolnierkiewicz wrote:
> > On Thursday 12 February 2009, Randy Dunlap wrote:
> >> Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> Changes since 20090211:
> >>
> >> When
> >> # CONFIG_BLK_DEV_IDEDMA is not set
> >>
> >> linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)
> >
> > Thanks for spotting this, I fixed it in the revised patch:
>
> Hi Bart,
>
> Have you pushed this patch yet?
>
> linux-next (20090218) is still getting this IDE build error.
I got caught by some other things yesterday so this was pushed
out today. Sorry about confusion/delay.
Thanks,
Bart
^ permalink raw reply
* [PATCH v2] module: fix build for CONFIG_SYSFS=n
From: Randy Dunlap @ 2009-02-18 18:35 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Stephen Rothwell, linux-next, LKML, Rusty Russell
In-Reply-To: <20090218180932.GC19995@elte.hu>
> Is destroy_params() dependent on SYSFS? If yes then it would be
Yes.
> far cleaner if there was a NOP destroy_params() inline for the
> !SYSFS case.
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix this build error when CONFIG_SYSFS=n:
kernel/built-in.o: In function `free_module':
module.c:(.text+0x4f8a2): undefined reference to `destroy_params'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: Rusty Russell <rusty@rustcorp.com.au>
---
kernel/params.c | 6 ++++++
1 file changed, 6 insertions(+)
--- linux-next-20090218.orig/kernel/params.c
+++ linux-next-20090218/kernel/params.c
@@ -761,6 +761,12 @@ static int __init param_sysfs_init(void)
}
subsys_initcall(param_sysfs_init);
+#else /* !CONFIG_SYSFS */
+
+inline void destroy_params(const struct kernel_param *params, unsigned num)
+{
+}
+
#endif /* CONFIG_SYSFS */
EXPORT_SYMBOL(param_set_byte);
^ permalink raw reply
* Re: [PATCH] module: fix build for CONFIG_SYSFS=n
From: Ingo Molnar @ 2009-02-18 18:09 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, Rusty Russell
In-Reply-To: <499C4D35.9000104@oracle.com>
* Randy Dunlap <randy.dunlap@oracle.com> wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix this build error when CONFIG_SYSFS=n:
>
> kernel/built-in.o: In function `free_module':
> module.c:(.text+0x4f8a2): undefined reference to `destroy_params'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Rusty Russell <rusty@rustcorp.com.au>
> ---
> kernel/module.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> --- linux-next-20090218.orig/kernel/module.c
> +++ linux-next-20090218/kernel/module.c
> @@ -1464,8 +1464,10 @@ static void free_module(struct module *m
> /* Module unload stuff */
> module_unload_free(mod);
>
> +#ifdef CONFIG_SYSFS
> /* Free any allocated parameters. */
> destroy_params(mod->kp, mod->num_kp);
> +#endif
Is destroy_params() dependent on SYSFS? If yes then it would be
far cleaner if there was a NOP destroy_params() inline for the
!SYSFS case.
Ingo
^ permalink raw reply
* [PATCH] module: fix build for CONFIG_SYSFS=n
From: Randy Dunlap @ 2009-02-18 18:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Rusty Russell
In-Reply-To: <20090218191640.0b023029.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix this build error when CONFIG_SYSFS=n:
kernel/built-in.o: In function `free_module':
module.c:(.text+0x4f8a2): undefined reference to `destroy_params'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: Rusty Russell <rusty@rustcorp.com.au>
---
kernel/module.c | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20090218.orig/kernel/module.c
+++ linux-next-20090218/kernel/module.c
@@ -1464,8 +1464,10 @@ static void free_module(struct module *m
/* Module unload stuff */
module_unload_free(mod);
+#ifdef CONFIG_SYSFS
/* Free any allocated parameters. */
destroy_params(mod->kp, mod->num_kp);
+#endif
/* release any pointers to mcount in this module */
ftrace_release(mod->module_core, mod->core_size);
^ permalink raw reply
* Re: linux-next: Tree for February 12 (ide)
From: Randy Dunlap @ 2009-02-18 17:17 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, linux-ide,
Sergei Shtylyov
In-Reply-To: <200902171519.27031.bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz wrote:
> On Thursday 12 February 2009, Randy Dunlap wrote:
>> Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20090211:
>>
>> When
>> # CONFIG_BLK_DEV_IDEDMA is not set
>>
>> linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)
>
> Thanks for spotting this, I fixed it in the revised patch:
Hi Bart,
Have you pushed this patch yet?
linux-next (20090218) is still getting this IDE build error.
Thanks.
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
>
> * Rename dma_timer_expiry() to ide_dma_sff_timer_expiry() and export it.
>
> * Add ->dma_timer_expiry method and use it to set hwif->expiry for
> ATA_PROT_DMA protocol in do_rw_taskfile().
>
> * Initialize ->dma_timer_expiry to ide_dma_sff_timer_expiry() for SFF hosts.
>
> * Move setting hwif->expiry from ide_execute_command() to its users and drop
> 'expiry' argument.
>
> * Use ide_execute_command() instead of ->dma_exec_cmd in do_rw_taskfile().
>
> * Remove ->dma_exec_cmd method and its implementations.
>
> * Unexport ide_execute_command() and ide_dma_intr().
>
> v2:
> * Fix CONFIG_BLK_DEV_IDEDMA=n build (noticed by Randy Dunlap).
>
> * Fix *dma_expiry naming (suggested by Sergei Shtylyov).
>
> There should be no functional changes caused by this patch.
>
> Cc: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
> drivers/ide/alim15x3.c | 2 +-
> drivers/ide/au1xxx-ide.c | 8 --------
> drivers/ide/cmd64x.c | 6 +++---
> drivers/ide/cs5536.c | 2 +-
> drivers/ide/hpt366.c | 6 +++---
> drivers/ide/icside.c | 7 -------
> drivers/ide/ide-atapi.c | 3 ++-
> drivers/ide/ide-dma-sff.c | 15 ++++-----------
> drivers/ide/ide-dma.c | 1 -
> drivers/ide/ide-iops.c | 6 +-----
> drivers/ide/ide-taskfile.c | 6 ++++--
> drivers/ide/it821x.c | 2 +-
> drivers/ide/ns87415.c | 2 +-
> drivers/ide/pdc202xx_old.c | 4 ++--
> drivers/ide/pmac.c | 8 --------
> drivers/ide/sc1200.c | 2 +-
> drivers/ide/scc_pata.c | 2 +-
> drivers/ide/siimage.c | 2 +-
> drivers/ide/sl82c105.c | 2 +-
> drivers/ide/tc86c001.c | 2 +-
> drivers/ide/trm290.c | 6 ------
> drivers/ide/tx4939ide.c | 2 +-
> include/linux/ide.h | 8 ++++----
> 23 files changed, 33 insertions(+), 71 deletions(-)
--
~Randy
^ permalink raw reply
* Re: [s390] next Feb 18: defconfig build break
From: Mike Frysinger @ 2009-02-18 17:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Sachin P. Sant, Rusty Russell, linux-s390, linux-next, LKML,
schwidefsky, heiko.carstens
In-Reply-To: <20090218224541.fe6e0355.sfr@canb.auug.org.au>
On Wed, Feb 18, 2009 at 06:45, Stephen Rothwell wrote:
> On Wed, 18 Feb 2009 15:59:20 +0530 "Sachin P. Sant" wrote:
>> Next Feb 18 defconfig build on s390 fails with following error.
>>
>> CC arch/s390/lib/string.o
>> In file included from include/linux/bitmap.h:8,
>> from include/linux/cpumask.h:142,
>> from include/linux/smp.h:12,
>> from /usr/local/autobench/var/tmp/build/linux/arch/s390/include/asm/spinlock.h:14,
>> from include/linux/spinlock.h:88,
>> from include/linux/seqlock.h:29,
>> from include/linux/time.h:8,
>> from include/linux/stat.h:60,
>> from include/linux/module.h:10,
>> from arch/s390/lib/string.c:13:
>> include/linux/string.h: In function 'strstarts':
>> include/linux/string.h:124: error: implicit declaration of function 'strlen'
>> include/linux/string.h:124: warning: incompatible implicit declaration of built-in function 'strlen'
>> make[1]: *** [arch/s390/lib/string.o] Error 1
>> make: *** [arch/s390/lib] Error 2
>
> That would be a side effect of commit 43a47c6ca0e0b5479ae316e188a28b7e625d41e5 ("misc:strstarts") from the rr tree. Rusty cc'd.
breaks all Blackfin ports as well:
In file included from include/linux/bitmap.h:9,
from include/linux/nodemask.h:90,
from include/linux/mmzone.h:17,
from include/linux/gfp.h:5,
from include/linux/kmod.h:23,
from include/linux/module.h:14,
from arch/blackfin/lib/strncmp.c:14:
include/linux/string.h: In function 'strstarts':
include/linux/string.h:124: error: implicit declaration of function 'strncmp'
make[1]: *** [arch/blackfin/lib/strncmp.o] Error 1
make: *** [arch/blackfin/lib] Error 2
-mike
^ 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