Skip to contentSkip to conversation

linux-next: Tree for October 14

PATCH In review Stephen Rothwell 8 participants 20 messages Oct 14, 2009 – Oct 30, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Changes since 20091013:

Undropped tree: i7core_edac

My fixes tree contains a build fix for powerpc/kvm.

The pci tree gained a conflict against Linus' tree.

The kbuild tree gained a build failure that required me to remove include/asm/asm-offsets.h from my object tree.

The net tree lost its build failure.

The percpu tree lost its build failure.

The tty tree still had a build failure for which I reverted a commit.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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 - this fails its final link) 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 143 trees (counting Linus' and 22 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.

Signature · 165 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
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/tty.current
Merging quilt/usb.current
Merging quilt/staging.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 ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
CONFLICT (content): Merge conflict in fs/ecryptfs/Kconfig
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pci.c
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
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
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/for-jens
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c
CONFLICT (add/add): Merge conflict in include/linux/drbd.h
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging tip/auto-latest
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
[master f54ea71] Revert "tty: esp: remove broken driver"
Merging scsi-post-merge/master
#1 lore raw
Quoted 19 lines · On Wed, 14 Oct 2009 16:34:45 +1100 Stephen Rothwell wrote:

Changes since 20091013:

Undropped tree: i7core_edac

My fixes tree contains a build fix for powerpc/kvm.

The pci tree gained a conflict against Linus' tree.

The kbuild tree gained a build failure that required me to remove include/asm/asm-offsets.h from my object tree.

The net tree lost its build failure.

The percpu tree lost its build failure.

The tty tree still had a build failure for which I reverted a commit.

----------------------------------------------------------------------------

Quoted 7 lines

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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).

Hi Stephen,

Where are today's .bz2 file and the .sign files?

and when did pub/kernel/people/sfr/linux-next/ disappear?

The kernel.org/kdist/finger_banner file now reports:
The latest linux-next version of the Linux kernel is: next-20091013

instead of 20091014.

---
~Randy

#2 lore raw

Hi Randy,

Quoted 2 lines · On Wed, 14 Oct 2009 08:55:15 -0700 Randy Dunlap <[email protected]> wrote:

Where are today's .bz2 file and the .sign files?

I only upload the .gz and some global script creates the other files automatically. That seems to have failed sometime yesterday but someone has fixed it, now.

Quoted 1 line

and when did pub/kernel/people/sfr/linux-next/ disappear?

/pub/linux/kernel/people/sfr/linux-next is still there (it is a symlink to /pub/linux/kernel/v2.6/next).

Quoted 2 lines

The kernel.org/kdist/finger_banner file now reports:
The latest linux-next version of the Linux kernel is: next-20091013

That would probably be the same problem as above.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#3 lore raw

PATCH 1/1 ia64/sn: fix percpu warnings

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix percpu types warning in ia64/sn:

arch/ia64/sn/kernel/setup.c:74: error: conflicting types for '__pcpu_scope___sn_cnodeid_to_nasid' arch/ia64/include/asm/sn/arch.h:74: error: previous declaration of '__pcpu_scope___sn_cnodeid_to_nasid' was here

---
 arch/ia64/include/asm/sn/arch.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/include/asm/sn/arch.h +1 -1
@@ -71,7 +71,7 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __
  * Compact node ID to nasid mappings kept in the per-cpu data areas of each
  * cpu.
  */
-DECLARE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
+DECLARE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);
 #define sn_cnodeid_to_nasid	(&__get_cpu_var(__sn_cnodeid_to_nasid[0]))
 
 
Acked-by on v1 1/1
#4 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 9 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix percpu types warning in ia64/sn:

arch/ia64/sn/kernel/setup.c:74: error: conflicting types for '__pcpu_scope___sn_cnodeid_to_nasid' arch/ia64/include/asm/sn/arch.h:74: error: previous declaration of '__pcpu_scope___sn_cnodeid_to_nasid' was here

Can this go through ia64 tree? If not, I can route it through percpu#for-fixes.

Thanks.

Signature · 1 line
tejun
#5 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 4 lines

Can this go through ia64 tree?  If not, I can route it through percpu#for-fixes.

It can ... but I'm getting a strange warning since I applied it:

Building modules, stage 2.
GZIP arch/ia64/hp/sim/boot/vmlinux.gz
MODPOST 198 modules
WARNING: "per_cpu____sn_cnodeid_to_nasid" [drivers/misc/sgi-xp/xpc.ko] has no CRC!

Any idea what this means?

-Tony

#6 lore raw

RE: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 1 line

WARNING: "per_cpu____sn_cnodeid_to_nasid" [drivers/misc/sgi-xp/xpc.ko] has no CRC!

Note that this warning goes away if I fix the mismatch declaration so that we have:

DECLARE_PER_CPU(short, __sn_cnodeide_to_nasid[MAX_COMPACT_NODES]); in arch.h

and

DEFINE_PER_CPU(short, __sn_cnodeide_to_nasid[MAX_COMPACT_NODES]); in setup.c

-Tony

#7 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Hello,

Quoted 5 lines · Tony
Quoted 1 line

WARNING: "per_cpu____sn_cnodeid_to_nasid" [drivers/misc/sgi-xp/xpc.ko] has no CRC!

Note that this warning goes away if I fix the mismatch declaration so that we have:

Quoted 7 lines

DECLARE_PER_CPU(short, __sn_cnodeide_to_nasid[MAX_COMPACT_NODES]); in arch.h

and

DEFINE_PER_CPU(short, __sn_cnodeide_to_nasid[MAX_COMPACT_NODES]); in setup.c

Umm... the correct correct declaration and definition would be

DECLARE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeide_to_nasid);

and

DEFINE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeide_to_nasid);

So that the first part contains full type. Doing it the other way might cause problems if the __weak trick is turned on.

Thanks.

Signature · 1 line
tejun
#8 lore raw

RE: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 10 lines

Umm... the correct correct declaration and definition would be

DECLARE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeide_to_nasid);

and

DEFINE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeide_to_nasid);

So that the first part contains full type. Doing it the other way might cause problems if the __weak trick is turned on.

That's what Randy's patch uses ... but doing it the "right" way gives me the "has no CRC!" warning.

This seems to be a feature of exported per cpu arrays. If I hack up a driver to make use of softirq_work_list, I see a similar no CRC warning for it.

Is this problem in the ia64 tool chain[1]? Or do other architectures have problems with exported per cpu arrays?

-Tony

[1] My default toolchain is uses gcc 4.1.2. But 4.4.1 has the same behavior.

#9 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Hello,

Quoted 2 lines · Tony

That's what Randy's patch uses ... but doing it the "right" way gives me the "has no CRC!" warning.

Ah, right. I got confused.

Quoted 6 lines

This seems to be a feature of exported per cpu arrays. If I hack up a driver to make use of softirq_work_list, I see a similar no CRC warning for it.

Is this problem in the ia64 tool chain[1]? Or do other architectures have problems with exported per cpu arrays?

kern/softirq.c has the followings.

DEFINE_PER_CPU(struct list_head [NR_SOFTIRQS], softirq_work_list); EXPORT_PER_CPU_SYMBOL(softirq_work_list);

and it doesn't cause any warning on x86 neither does it on ia64 with defconfig. softirq_work_list doesn't trigger any warning there, right?

Thanks.

Signature · 1 line
tejun
#10 lore raw

RE: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 6 lines

DEFINE_PER_CPU(struct list_head [NR_SOFTIRQS], softirq_work_list); EXPORT_PER_CPU_SYMBOL(softirq_work_list);

and it doesn't cause any warning on x86 neither does it on ia64 with defconfig. softirq_work_list doesn't trigger any warning there, right?

Of the 10 EXPORT_PER_CPU_SYMBOL and 4 EXPORT_PER_CPU_SYMBOL_GPL items on ia64, only __sn_cnodeid_to_nasid and softirq_work_list are arrays. The latter appears not to be actually used by any in-tree modules (janitors: does it need to be exported?).

The CRC warning only shows up on a module that uses an exported per-cpu array. There seems to be nothing special about the __sn_cnodeid_to_nasid. When I hacked a module to make a random use of softirq_work_list, it too gave a CRC error.

I just tried an x86_64 build with a module also modified to access softirq_work_list. It did NOT get a CRC error. So the x86_64 toolchain doesn't seem to have the same issue as ia64.

-Tony

#11 lore raw

RE: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 3 lines

I just tried an x86_64 build with a module also modified to access softirq_work_list. It did NOT get a CRC error. So the x86_64 toolchain doesn't seem to have the same issue as ia64.

Ok. x86 doesn't see this because the defconfig has
CONFIG_MODVERSIONS is not set

If I turn MODVERSION off, then the problem disappears for me.

If I turn MODVERSIONS on for x86 (and fudge a driver to make use of softirq_work_list), then x86 gets the CRC warning too.

So this isn't a tool chain problem. Neither x86 nor ia64 can handle exported per-cpu array objects when CONFIG_MODVERSIONS is set.

Looking at the __crc symbols in the vmlinux for x86 with CONFIG_MODVERSIONS=y I see:

000000006dcaeb88 A __crc_per_cpu__kernel_stack 00000000b3994c7a A __crc_per_cpu__kstat 00000000d917c158 A __crc_per_cpu__node_number
w __crc_per_cpu__softirq_work_list
0000000036a1f502 A __crc_per_cpu__softnet_data 0000000057adf756 A __crc_per_cpu__this_cpu_off

which explains why "modpost" is unable to find a CRC.

Maybe the comments in <linux/module.h> are supposed to be a clue? :

#ifdef CONFIG_MODVERSIONS
/* Mark the CRC weak since genksyms apparently decides not to
* generate a checksums for some symbols */

#define __CRC_SYMBOL(sym, sec)                                  \
        extern void *__crc_##sym __attribute__((weak));         \
        static const unsigned long __kcrctab_##sym              \
        __used                                                  \
        __attribute__((section("__kcrctab" sec), unused))       \
        = (unsigned long) &__crc_##sym;

But not enough of a clue for me :-(

-Tony

#12 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Hello,

Quoted 7 lines · Tony

Ok. x86 doesn't see this because the defconfig has
CONFIG_MODVERSIONS is not set

If I turn MODVERSION off, then the problem disappears for me.

If I turn MODVERSIONS on for x86 (and fudge a driver to make use of softirq_work_list), then x86 gets the CRC warning too.

Right, I can reproduce it here too.

Quoted 22 lines

So this isn't a tool chain problem. Neither x86 nor ia64 can handle exported per-cpu array objects when CONFIG_MODVERSIONS is set.

Looking at the __crc symbols in the vmlinux for x86 with CONFIG_MODVERSIONS=y I see:

000000006dcaeb88 A __crc_per_cpu__kernel_stack 00000000b3994c7a A __crc_per_cpu__kstat 00000000d917c158 A __crc_per_cpu__node_number
w __crc_per_cpu__softirq_work_list
0000000036a1f502 A __crc_per_cpu__softnet_data 0000000057adf756 A __crc_per_cpu__this_cpu_off

which explains why "modpost" is unable to find a CRC.

Maybe the comments in <linux/module.h> are supposed to be a clue? :

#ifdef CONFIG_MODVERSIONS
/* Mark the CRC weak since genksyms apparently decides not to
* generate a checksums for some symbols */

Quoted 8 lines
#define __CRC_SYMBOL(sym, sec)                                  \
        extern void *__crc_##sym __attribute__((weak));         \
        static const unsigned long __kcrctab_##sym              \
        __used                                                  \
        __attribute__((section("__kcrctab" sec), unused))       \
        = (unsigned long) &__crc_##sym;

But not enough of a clue for me :-(

I have no idea either. I'll dig a bit and try to find out what's going on.

Thanks.

Signature · 1 line
tejun
#13 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Yiee... lexer/parser problem in genksyms. cc'ing Andreas, Sam and Jan for help and quoting whole body.

Hello,

Quoted 42 lines · Tejun Heo

Hello,

Quoted 7 lines · Tony

Ok. x86 doesn't see this because the defconfig has
CONFIG_MODVERSIONS is not set

If I turn MODVERSION off, then the problem disappears for me.

If I turn MODVERSIONS on for x86 (and fudge a driver to make use of softirq_work_list), then x86 gets the CRC warning too.

Right, I can reproduce it here too.

Quoted 29 lines

So this isn't a tool chain problem. Neither x86 nor ia64 can handle exported per-cpu array objects when CONFIG_MODVERSIONS is set.

Looking at the __crc symbols in the vmlinux for x86 with CONFIG_MODVERSIONS=y I see:

000000006dcaeb88 A __crc_per_cpu__kernel_stack 00000000b3994c7a A __crc_per_cpu__kstat 00000000d917c158 A __crc_per_cpu__node_number
w __crc_per_cpu__softirq_work_list
0000000036a1f502 A __crc_per_cpu__softnet_data 0000000057adf756 A __crc_per_cpu__this_cpu_off

which explains why "modpost" is unable to find a CRC.

Maybe the comments in <linux/module.h> are supposed to be a clue? :

#ifdef CONFIG_MODVERSIONS
/* Mark the CRC weak since genksyms apparently decides not to
* generate a checksums for some symbols */

#define __CRC_SYMBOL(sym, sec)                                  \
        extern void *__crc_##sym __attribute__((weak));         \
        static const unsigned long __kcrctab_##sym              \
        __used                                                  \
        __attribute__((section("__kcrctab" sec), unused))       \
        = (unsigned long) &__crc_##sym;
Quoted 4 lines
Quoted 1 line

But not enough of a clue for me :-(

I have no idea either. I'll dig a bit and try to find out what's going on.

So, the problem is that genksyms can't understand the following.

  __typeof__(int [10]) my_ar;
  EXPORT_SYMBOL(my_ar);

Would it be difficult to teach it how to parse it?

Thanks.

Signature · 1 line
tejun
#14 lore raw

Re: [PATCH -next] ia64/sn: fix percpu warnings

Quoted 5 lines
Quoted 1 line
Quoted 1 line

Tejun Heo <[email protected]> 29.10.09 16:43 >>>

So, the problem is that genksyms can't understand the following.

__typeof__(int [10]) my_ar;
EXPORT_SYMBOL(my_ar);

In fact almost no use of typeof() works with genksyms: Out of

#include <linux/module.h>

extern int x;

#define export(t, n) typeof(t) export_##n; EXPORT_SYMBOL(export_##n)

export(x, a);
export(&x, b);
export(int, c);
export(int*, d);
export(int**, e);
export(int[4], f);
export(typeof(x), g);
export(typeof(&x), h);
export(typeof(x)*, i);

only c and d get a non-zero CRC. This is clearly due to the naive parsing scripts/genksyms/parse.y does:

type_specifier:

	simple_type_specifier
	| cvar_qualifier
	| TYPEOF_KEYW '(' decl_specifier_seq '*' ')'
	| TYPEOF_KEYW '(' decl_specifier_seq ')'
	...
Quoted 1 line

Would it be difficult to teach it how to parse it?

For someone familiar with bison/yacc this would seem not very difficult a job, but as far as I'm concerned this is not something I would feel comfortable trying to fix. Of course one could go the simplistic route and just add the array case here, but imo this wouldn't be the right way to deal with it.

Jan

#15 lore raw

PATCH 1/1 kvm: fix ia64 printk formats

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix printk formats in ia64/kvm:

arch/ia64/kvm/kvm-ia64.c:250: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'uint64_t' arch/ia64/kvm/kvm-ia64.c:774: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'uint64_t' arch/ia64/kvm/kvm_fw.c:151: warning: format '%ld' expects type 'long int', but argument 3 has type 's64' arch/ia64/kvm/kvm_fw.c:151: warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'u64' arch/ia64/kvm/kvm_fw.c:151: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'u64' arch/ia64/kvm/kvm_fw.c:548: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'

---
 arch/ia64/kvm/kvm-ia64.c |    4 ++--
 arch/ia64/kvm/kvm_fw.c   |    9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
arch/ia64/kvm/kvm-ia64.c +2 -2
@@ -247,7 +247,7 @@ mmio:
 		r = kvm_io_bus_write(&vcpu->kvm->mmio_bus, p->addr,
 				     p->size, &p->data);
 	if (r)
-		printk(KERN_ERR"kvm: No iodevice found! addr:%lx\n", p->addr);
+		printk(KERN_ERR "kvm: No iodevice found! addr:%llx\n", p->addr);
 	p->state = STATE_IORESP_READY;
 
 	return 1;
@@ -771,7 +771,7 @@ static struct kvm *kvm_alloc_kvm(void)
 	kvm = (struct kvm *)(vm_base +
 			offsetof(struct kvm_vm_data, kvm_vm_struct));
 	kvm->arch.vm_base = vm_base;
-	printk(KERN_DEBUG"kvm: vm's data area:0x%lx\n", vm_base);
+	printk(KERN_DEBUG "kvm: vm's data area:0x%llx\n", vm_base);
 
 	return kvm;
 }
arch/ia64/kvm/kvm_fw.c +5 -4
@@ -146,9 +146,10 @@ static struct ia64_pal_retval pal_cache_
 						&result.v0);
 	local_irq_restore(psr);
 	if (result.status != 0)
-		printk(KERN_ERR"vcpu:%p crashed due to cache_flush err:%ld"
+		printk(KERN_ERR "vcpu:%p crashed due to cache_flush err:%ld"
 				"in1:%lx,in2:%lx\n",
-				vcpu, result.status, gr29, gr30);
+				vcpu, (long)result.status,
+				(unsigned long)gr29, (unsigned long)gr30);
 
 #if 0
 	if (gr29 = PAL_CACHE_TYPE_COHERENT) {
@@ -544,8 +545,8 @@ int kvm_pal_emul(struct kvm_vcpu *vcpu, 
 		break;
 	default:
 		INIT_PAL_STATUS_UNIMPLEMENTED(result);
-		printk(KERN_WARNING"kvm: Unsupported pal call,"
-					" index:0x%lx\n", gr28);
+		printk(KERN_WARNING "kvm: Unsupported pal call,"
+					" index:0x%lx\n", (unsigned long)gr28);
 	}
 	set_pal_result(vcpu, result);
 	return ret;
#16 lore raw

RE: [PATCH -next] kvm: fix ia64 printk formats

Seems strict checks are applied to latest kernel. Okay to me. Thanks! Acked-By Xiantao Zhang <[email protected]>
Xiantao

Quoted 69 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix printk formats in ia64/kvm:

arch/ia64/kvm/kvm-ia64.c:250: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'uint64_t' arch/ia64/kvm/kvm-ia64.c:774: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'uint64_t' arch/ia64/kvm/kvm_fw.c:151: warning: format '%ld' expects type 'long int', but argument 3 has type 's64' arch/ia64/kvm/kvm_fw.c:151:
warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'u64' arch/ia64/kvm/kvm_fw.c:151: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'u64' arch/ia64/kvm/kvm_fw.c:548: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'

---
 arch/ia64/kvm/kvm-ia64.c |    4 ++--
 arch/ia64/kvm/kvm_fw.c   |    9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
arch/ia64/kvm/kvm-ia64.c +2 -2
@@ -247,7 +247,7 @@ mmio:
 		r = kvm_io_bus_write(&vcpu->kvm->mmio_bus, p->addr,
 				     p->size, &p->data);
 	if (r)
-		printk(KERN_ERR"kvm: No iodevice found! addr:%lx\n", p->addr);
+		printk(KERN_ERR "kvm: No iodevice found! addr:%llx\n", p->addr);
 	p->state = STATE_IORESP_READY;
 
 	return 1;
@@ -771,7 +771,7 @@ static struct kvm *kvm_alloc_kvm(void)
 	kvm = (struct kvm *)(vm_base +
 			offsetof(struct kvm_vm_data, kvm_vm_struct));
 	kvm->arch.vm_base = vm_base;
-	printk(KERN_DEBUG"kvm: vm's data area:0x%lx\n", vm_base);
+	printk(KERN_DEBUG "kvm: vm's data area:0x%llx\n", vm_base);
 
 	return kvm;
 }
arch/ia64/kvm/kvm_fw.c +5 -4
@@ -146,9 +146,10 @@ static struct ia64_pal_retval pal_cache_
 						&result.v0);
 	local_irq_restore(psr);
 	if (result.status != 0)
-		printk(KERN_ERR"vcpu:%p crashed due to cache_flush err:%ld"
+		printk(KERN_ERR "vcpu:%p crashed due to cache_flush err:%ld"
 				"in1:%lx,in2:%lx\n",
-				vcpu, result.status, gr29, gr30);
+				vcpu, (long)result.status,
+				(unsigned long)gr29, (unsigned long)gr30);
 
 #if 0
 	if (gr29 = PAL_CACHE_TYPE_COHERENT) {
@@ -544,8 +545,8 @@ int kvm_pal_emul(struct kvm_vcpu *vcpu,
 		break;
 	default:
 		INIT_PAL_STATUS_UNIMPLEMENTED(result);
-		printk(KERN_WARNING"kvm: Unsupported pal call,"
-					" index:0x%lx\n", gr28);
+		printk(KERN_WARNING "kvm: Unsupported pal call,"
+					" index:0x%lx\n", (unsigned long)gr28);
 	}
 	set_pal_result(vcpu, result);
 	return ret;
#17 lore raw

PATCH 1/1 vmxnet: fix 2 build problems

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

vmxnet3 uses in_dev* interfaces so it should depend on INET. Also fix so that the driver builds when CONFIG_PCI_MSI is disabled.

vmxnet3_drv.c:(.text+0x2a88cb): undefined reference to `in_dev_finish_destroy'

drivers/net/vmxnet3/vmxnet3_drv.c:1335: error: 'struct vmxnet3_intr' has no member named 'msix_entries' drivers/net/vmxnet3/vmxnet3_drv.c:1384: error: 'struct vmxnet3_intr' has no member named 'msix_entries' drivers/net/vmxnet3/vmxnet3_drv.c:2137: error: 'struct vmxnet3_intr' has no member named 'msix_entries' drivers/net/vmxnet3/vmxnet3_drv.c:2138: error: 'struct vmxnet3_intr' has no member named 'msix_entries'

---
 drivers/net/Kconfig               |    2 +-
 drivers/net/vmxnet3/vmxnet3_drv.c |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +10 -1
@@ -1314,9 +1314,11 @@ vmxnet3_netpoll(struct net_device *netde
 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);
 	int irq;
 
+#ifdef CONFIG_PCI_MSI
 	if (adapter->intr.type == VMXNET3_IT_MSIX)
 		irq = adapter->intr.msix_entries[0].vector;
 	else
+#endif
 		irq = adapter->pdev->irq;
 
 	disable_irq(irq);
@@ -1330,12 +1332,15 @@ vmxnet3_request_irqs(struct vmxnet3_adap
 {
 	int err;
 
+#ifdef CONFIG_PCI_MSI
 	if (adapter->intr.type == VMXNET3_IT_MSIX) {
 		/* we only use 1 MSI-X vector */
 		err = request_irq(adapter->intr.msix_entries[0].vector,
 				  vmxnet3_intr, 0, adapter->netdev->name,
 				  adapter->netdev);
-	} else if (adapter->intr.type == VMXNET3_IT_MSI) {
+	} else
+#endif
+	if (adapter->intr.type == VMXNET3_IT_MSI) {
 		err = request_irq(adapter->pdev->irq, vmxnet3_intr, 0,
 				  adapter->netdev->name, adapter->netdev);
 	} else {
@@ -1376,6 +1381,7 @@ vmxnet3_free_irqs(struct vmxnet3_adapter
 	       adapter->intr.num_intrs <= 0);
 
 	switch (adapter->intr.type) {
+#ifdef CONFIG_PCI_MSI
 	case VMXNET3_IT_MSIX:
 	{
 		int i;
@@ -1385,6 +1391,7 @@ vmxnet3_free_irqs(struct vmxnet3_adapter
 				 adapter->netdev);
 		break;
 	}
+#endif
 	case VMXNET3_IT_MSI:
 		free_irq(adapter->pdev->irq, adapter->netdev);
 		break;
@@ -2134,6 +2141,7 @@ vmxnet3_alloc_intr_resources(struct vmxn
 	if (adapter->intr.type == VMXNET3_IT_AUTO) {
 		int err;
 
+#ifdef CONFIG_PCI_MSI
 		adapter->intr.msix_entries[0].entry = 0;
 		err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
 				      VMXNET3_LINUX_MAX_MSIX_VECT);
@@ -2142,6 +2150,7 @@ vmxnet3_alloc_intr_resources(struct vmxn
 			adapter->intr.type = VMXNET3_IT_MSIX;
 			return;
 		}
+#endif
 
 		err = pci_enable_msi(adapter->pdev);
 		if (!err) {
drivers/net/Kconfig +1 -1
@@ -3232,7 +3232,7 @@ config VIRTIO_NET
 
 config VMXNET3
        tristate "VMware VMXNET3 ethernet driver"
-       depends on PCI && X86
+       depends on PCI && X86 && INET
        help
          This driver supports VMware's vmxnet3 virtual ethernet NIC.
          To compile this driver as a module, choose M here: the
#18 lore raw

Re: [Pv-drivers] [PATCH -next] vmxnet: fix 2 build problems

Looks great! Thanks for making this change!

- Bhavesh

I'm usually not as bad with my spelling as my iPhone makes it appear.

On Oct 14, 2009, at 6:18 PM, "Randy Dunlap" <[email protected]<mailto:[email protected]>> wrote: