* linux-next: Tree for November 11
From: Stephen Rothwell @ 2010-11-11 1:56 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8432 bytes --]
Hi all,
Changes since 20101110:
Added tree: fbdev-current
The voltage tree gained a build failure so I used the version from
next-20101110.
The fsnotify tree still has its build failure so I used the version from
next-20101109.
----------------------------------------------------------------------------
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 179 trees (counting Linus' and 26 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 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 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/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
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 sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
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 mmc/mmc-next
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 fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
$ git reset --hard HEAD^
Merging refs/next/20101110/voltage
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
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
CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
$ git reset --hard HEAD^
Merging refs/next/20101109/fsnotify
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c
CONFLICT (content): Merge conflict in arch/x86/xen/setup.c
Merging swiotlb-xen/master
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for November 10 (kernel/rcutiny)
From: Paul E. McKenney @ 2010-11-11 3:31 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <4CDB2C94.4010007@oracle.com>
On Wed, Nov 10, 2010 at 03:36:52PM -0800, Randy Dunlap wrote:
> On 11/10/10 15:07, Paul E. McKenney wrote:
> > On Wed, Nov 10, 2010 at 09:19:26AM -0800, Randy Dunlap wrote:
> >> On Wed, 10 Nov 2010 14:07:19 +1100 Stephen Rothwell wrote:
> >>
> >>> Hi all,
> >>>
> >>> Changes since 20101109:
> >>
> >>
> >> when CONFIG_RCU_BOOST is not enabled:
> >>
> >> In file included from linux-next-20101110/kernel/rcutiny.c:53:
> >> linux-next-20101110/kernel/rcutiny_plugin.h: In function 'rcu_preempt_cpu_qs':
> >> linux-next-20101110/kernel/rcutiny_plugin.h:413: error: 'struct rcu_preempt_ctrlblk' has no member named 'n_normal_balk_blkd_tasks'
> >
> > Hello, Randy,
> >
> > Good catch! Could you please try the following patch?
>
> (you tested this build, didn't you?)
Obviously not well enough.
> Yes, this builds. Thanks.
Thank you!
Thanx, Paul
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>
>
> > ------------------------------------------------------------------------
> >
> > diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
> > index 297aa35..8cd197c 100644
> > --- a/kernel/rcutiny_plugin.h
> > +++ b/kernel/rcutiny_plugin.h
> > @@ -297,9 +297,17 @@ static int rcu_boost(void)
> > * the current grace period, and, if so, tell the rcu_kthread_task to
> > * start boosting them. If there is an expedited boost in progress,
> > * we wait for it to complete.
> > + *
> > + * If there are no blocked readers blocking the current grace period,
> > + * return 0 to let the caller know, otherwise return 1. Note that this
> > + * return value is independent of whether or not boosting was done.
> > */
> > -static void rcu_initiate_boost(void)
> > +static int rcu_initiate_boost(void)
> > {
> > + if (!rcu_preempt_blocked_readers_cgp()) {
> > + RCU_TRACE(rcu_preempt_ctrlblk.n_normal_balk_blkd_tasks++);
> > + return 0;
> > + }
> > if (rcu_preempt_ctrlblk.gp_tasks != NULL &&
> > rcu_preempt_ctrlblk.boost_tasks == NULL &&
> > rcu_preempt_ctrlblk.boosted_this_gp == 0 &&
> > @@ -309,6 +317,7 @@ static void rcu_initiate_boost(void)
> > RCU_TRACE(rcu_preempt_ctrlblk.n_normal_boosts++);
> > } else
> > RCU_TRACE(rcu_initiate_boost_trace());
> > + return 1;
> > }
> >
> > /*
> > @@ -353,10 +362,13 @@ static int rcu_boost(void)
> > }
> >
> > /*
> > - * If there is no RCU priority boosting, we don't initiate boosting.
> > + * If there is no RCU priority boosting, we don't initiate boosting,
> > + * but we do indicate whether there are blocked readers blocking the
> > + * current grace period.
> > */
> > -static void rcu_initiate_boost(void)
> > +static int rcu_initiate_boost(void)
> > {
> > + return rcu_preempt_blocked_readers_cgp();
> > }
> >
> > /*
> > @@ -405,12 +417,12 @@ static void rcu_preempt_cpu_qs(void)
> > /* If there is no GP then there is nothing more to do. */
> > if (!rcu_preempt_gp_in_progress())
> > return;
> > - /* If there are blocked readers, go check up on boosting. */
> > - if (rcu_preempt_blocked_readers_cgp()) {
> > - rcu_initiate_boost();
> > + /*
> > + * Check up on boosting. If there are no readers blocking the
> > + * current grace period, leave.
> > + */
> > + if (rcu_initiate_boost())
> > return;
> > - } else
> > - RCU_TRACE(rcu_preempt_ctrlblk.n_normal_balk_blkd_tasks++);
> >
> > /* Advance callbacks. */
> > rcu_preempt_ctrlblk.completed = rcu_preempt_ctrlblk.gpnum;
>
>
> --
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply
* Re: linux-next: build failure after merge of the voltage tree
From: Mark Brown @ 2010-11-11 11:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel
In-Reply-To: <20101111113638.eb3101d0.sfr@canb.auug.org.au>
On Thu, Nov 11, 2010 at 11:36:38AM +1100, Stephen Rothwell wrote:
> After merging the voltage tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
Oh, a platform where pcap can actually be built! That's useful, thanks.
> drivers/regulator/pcap-regulator.c:155: error: expected declaration specifiers or '...' before 'unsiged'
> drivers/regulator/pcap-regulator.c: In function 'pcap_regulator_set_voltage':
> drivers/regulator/pcap-regulator.c:175: error: 'selector' undeclared (first use in this function)
> drivers/regulator/pcap-regulator.c: At top level:
> drivers/regulator/pcap-regulator.c:251: warning: initialization from incompatible pointer type
> Caused by commit d2f03ebfe8c63d1e3e1ab2352dd32d161546003e ("regulator:
> Report actual configured voltage to set_voltage()"). Please always build
> changed files ...
With a lot of the embedded drivers that can be difficult - often there
are dependencies on APIs that are only available on a small set of
platforms (which may not even be documented). For example, with PCAP
the core driver uses irq_to_gpio() which is not implemented on any of
the platforms I commonly build for.
^ permalink raw reply
* Re: linux-next: build failure after merge of the voltage tree
From: Liam Girdwood @ 2010-11-11 12:09 UTC (permalink / raw)
To: Mark Brown; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20101111114644.GC6052@rakim.wolfsonmicro.main>
On Thu, 2010-11-11 at 11:46 +0000, Mark Brown wrote:
> On Thu, Nov 11, 2010 at 11:36:38AM +1100, Stephen Rothwell wrote:
>
> > After merging the voltage tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
>
> Oh, a platform where pcap can actually be built! That's useful, thanks.
>
> > drivers/regulator/pcap-regulator.c:155: error: expected declaration specifiers or '...' before 'unsiged'
> > drivers/regulator/pcap-regulator.c: In function 'pcap_regulator_set_voltage':
> > drivers/regulator/pcap-regulator.c:175: error: 'selector' undeclared (first use in this function)
> > drivers/regulator/pcap-regulator.c: At top level:
> > drivers/regulator/pcap-regulator.c:251: warning: initialization from incompatible pointer type
>
> > Caused by commit d2f03ebfe8c63d1e3e1ab2352dd32d161546003e ("regulator:
> > Report actual configured voltage to set_voltage()"). Please always build
> > changed files ...
>
> With a lot of the embedded drivers that can be difficult - often there
> are dependencies on APIs that are only available on a small set of
> platforms (which may not even be documented). For example, with PCAP
> the core driver uses irq_to_gpio() which is not implemented on any of
> the platforms I commonly build for.
> --
Fix now applied.
Thanks
Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply
* Re: linux-next: Tree for November 11 (unifdef)
From: Randy Dunlap @ 2010-11-11 17:48 UTC (permalink / raw)
To: Stephen Rothwell, Tony Finch; +Cc: linux-next, LKML
In-Reply-To: <20101111125655.15fa7188.sfr@canb.auug.org.au>
On Thu, 11 Nov 2010 12:56:55 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20101110:
Hi Tony,
For the last week or so, linux-next tree has generated this warning:
unifdef: linux-next-20101111/X32/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)
linux/include/xen/privcmd.h contains:
#ifndef __user
#define __user
#endif
and linux/X32/usr/include/xen/privcmd.h contains:
#ifndef #define #endif
!!
Is this a problem with privcmd.h or unifdef or ???
thanks,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: Tree for November 11 (unifdef)
From: Tony Finch @ 2010-11-11 18:26 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, Tony Finch
In-Reply-To: <20101111094832.827aaab3.randy.dunlap@oracle.com>
On Thu, 11 Nov 2010, Randy Dunlap wrote:
>
> Is this a problem with privcmd.h or unifdef or ???
It's a problem with ???, specifically
scripts/headers_install.pl:33: $line =~ s/([\s(])__user\s/$1/g;
There are a few other files which have the same idiom which potentially
breaks headers_install
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
drivers/video/sis/sis_main.c
drivers/video/via/ioctl.h
Tony.
--
f.anthony.n.finch <dot@dotat.at> http://dotat.at/
HUMBER THAMES DOVER WIGHT PORTLAND: NORTH BACKING WEST OR NORTHWEST, 5 TO 7,
DECREASING 4 OR 5, OCCASIONALLY 6 LATER IN HUMBER AND THAMES. MODERATE OR
ROUGH. RAIN THEN FAIR. GOOD.
^ permalink raw reply
* [PATCH -next] staging/easycap: make module params private/static, fix build
From: Randy Dunlap @ 2010-11-11 18:44 UTC (permalink / raw)
To: Stephen Rothwell, Mike Thomas; +Cc: linux-next, LKML, gregkh
In-Reply-To: <20101111125655.15fa7188.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
The easycap driver has module parameters (bars, gain, & debug)
with global scope that intrude on the kernel namespace and cause
build problems. Change the names of them to be driver-specific
and make 2 of them static.
drivers/built-in.o:(.bss+0x97c00): multiple definition of `debug'
ld: Warning: size of symbol `debug' changed from 58 in arch/x86/built-in.o to 4 in drivers/built-in.o
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Mike Thomas <rmthomas@sciolus.org>
---
drivers/staging/easycap/easycap.h | 4 ++--
drivers/staging/easycap/easycap_debug.h | 4 ++--
drivers/staging/easycap/easycap_low.c | 10 +++++-----
drivers/staging/easycap/easycap_main.c | 18 +++++++++---------
4 files changed, 18 insertions(+), 18 deletions(-)
--- linux-next-20101111.orig/drivers/staging/easycap/easycap_main.c
+++ linux-next-20101111/drivers/staging/easycap/easycap_main.c
@@ -32,12 +32,12 @@
#include "easycap_standard.h"
#include "easycap_ioctl.h"
-int debug;
-int bars;
-int gain = 16;
-module_param(debug, int, S_IRUGO | S_IWUSR);
-module_param(bars, int, S_IRUGO | S_IWUSR);
-module_param(gain, int, S_IRUGO | S_IWUSR);
+static int easycap_debug;
+static int easycap_bars;
+int easycap_gain = 16;
+module_param_named(debug, easycap_debug, int, S_IRUGO | S_IWUSR);
+module_param_named(bars, easycap_bars, int, S_IRUGO | S_IWUSR);
+module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);
/*---------------------------------------------------------------------------*/
/*
@@ -1464,7 +1464,7 @@ if (peasycap->field_read == peasycap->fi
easycap_testcard(peasycap, peasycap->field_read);
#else
if (0 <= input && INPUT_MANY > input) {
- if (bars && VIDEO_LOST_TOLERATE <= peasycap->lost[input])
+ if (easycap_bars && VIDEO_LOST_TOLERATE <= peasycap->lost[input])
easycap_testcard(peasycap, peasycap->field_read);
}
#endif /*EASYCAP_TESTCARD*/
@@ -5008,8 +5008,8 @@ easycap_module_init(void)
int result;
SAY("========easycap=======\n");
-JOT(4, "begins. %i=debug %i=bars %i=gain\n", debug, bars, \
- gain);
+JOT(4, "begins. %i=debug %i=bars %i=gain\n", easycap_debug, easycap_bars, \
+ easycap_gain);
SAY("version: " EASYCAP_DRIVER_VERSION "\n");
/*---------------------------------------------------------------------------*/
/*
--- linux-next-20101111.orig/drivers/staging/easycap/easycap_debug.h
+++ linux-next-20101111/drivers/staging/easycap/easycap_debug.h
@@ -24,6 +24,6 @@
*
*/
/*****************************************************************************/
-extern int debug;
-extern int gain;
+extern int easycap_debug;
+extern int easycap_gain;
extern struct easycap_dongle easycap_dongle[];
--- linux-next-20101111.orig/drivers/staging/easycap/easycap.h
+++ linux-next-20101111/drivers/staging/easycap/easycap.h
@@ -630,13 +630,13 @@ unsigned long long int remainder;
#if defined(EASYCAP_DEBUG)
#define JOT(n, format, args...) do { \
- if (n <= debug) { \
+ if (n <= easycap_debug) { \
printk(KERN_DEBUG "easycap:: %s: " \
format, __func__, ##args);\
} \
} while (0)
#define JOM(n, format, args...) do { \
- if (n <= debug) { \
+ if (n <= easycap_debug) { \
printk(KERN_DEBUG "easycap::%i%s: " \
format, peasycap->isdongle, __func__, ##args);\
} \
--- linux-next-20101111.orig/drivers/staging/easycap/easycap_low.c
+++ linux-next-20101111/drivers/staging/easycap/easycap_low.c
@@ -1082,11 +1082,11 @@ SAM("0x%04X:0x%04X is audio vendor id\n"
* SELECT AUDIO SOURCE "LINE IN" AND SET THE AUDIO GAIN.
*/
/*---------------------------------------------------------------------------*/
-if (31 < gain)
- gain = 31;
-if (0 > gain)
- gain = 0;
-if (0 != audio_gainset(pusb_device, (__s8)gain))
+if (31 < easycap_gain)
+ easycap_gain = 31;
+if (0 > easycap_gain)
+ easycap_gain = 0;
+if (0 != audio_gainset(pusb_device, (__s8)easycap_gain))
SAY("ERROR: audio_gainset() failed\n");
check_vt(pusb_device);
return 0;
^ permalink raw reply
* Re: [PATCH -next] staging/easycap: make module params private/static, fix build
From: Randy Dunlap @ 2010-11-11 22:18 UTC (permalink / raw)
To: R.M. Thomas; +Cc: Stephen Rothwell, linux-next, LKML, gregkh
In-Reply-To: <4CDC67FF.3010006@sciolus.org>
On 11/11/10 14:02, R.M. Thomas wrote:
> Randy Dunlap wrote:
>> The easycap driver has module parameters (bars, gain, & debug)
>> with global scope that intrude on the kernel namespace and cause
>> build problems. Change the names of them to be driver-specific
>> and make 2 of them static.
>
> I did do test builds of the driver in-tree prior to submitting the
> recent set of patches, but did not see any warnings so did not spot
> this mistake. There's presumably something wrong with the way I'm
> building the kernel.
This build problem shows up when this driver is built into the kernel
image, not built as a loadable module. Did you only build as a loadable
module, maybe? and what CPU architecture did you build for? That could
also matter.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH -next] staging/easycap: make module params private/static, fix build
From: R.M. Thomas @ 2010-11-11 22:02 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, gregkh
In-Reply-To: <20101111104422.28594510.randy.dunlap@oracle.com>
Randy Dunlap wrote:
> The easycap driver has module parameters (bars, gain, & debug)
> with global scope that intrude on the kernel namespace and cause
> build problems. Change the names of them to be driver-specific
> and make 2 of them static.
I did do test builds of the driver in-tree prior to submitting the
recent set of patches, but did not see any warnings so did not spot
this mistake. There's presumably something wrong with the way I'm
building the kernel.
Thanks,
Mike
^ permalink raw reply
* linux-next: build failure after merge of the final tree (tty tree related)
From: Stephen Rothwell @ 2010-11-12 1:57 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Russ Gorby, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi Greg,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/serial/ifx6x60.c: In function 'ifx_spi_reset':
drivers/serial/ifx6x60.c:928: error: implicit declaration of function 'msleep'
Caused by commit af3b8881f4c9852eefe9c7f1a997b3ecf580561b ("ifx6x60: SPI
protocol driver for Infineon 6x60 modem"). An include is missing
(linux/delay.h). See Rule 1 in Documentation/SubmitChecklist.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: Tree for November 12
From: Stephen Rothwell @ 2010-11-12 2:05 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8221 bytes --]
Hi all,
Changes since 20101111:
The voltage tree lost its build failure.
The fsnotify tree lost its build failure.
The tty tree gained 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 179 trees (counting Linus' and 26 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 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 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/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
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 sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
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 mmc/mmc-next
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 fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
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
CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[master d0e885e] Revert "ifx6x60: SPI protocol driver for Infineon 6x60 modem"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH -next] staging/easycap: make module params private/static, fix build
From: R.M. Thomas @ 2010-11-12 10:30 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, gregkh
In-Reply-To: <4CDC6BA4.3060307@oracle.com>
Randy Dunlap wrote:
> On 11/11/10 14:02, R.M. Thomas wrote:
>> Randy Dunlap wrote:
>>> The easycap driver has module parameters (bars, gain, & debug)
>>> with global scope that intrude on the kernel namespace and cause
>>> build problems. Change the names of them to be driver-specific
>>> and make 2 of them static.
>> I did do test builds of the driver in-tree prior to submitting the
>> recent set of patches, but did not see any warnings so did not spot
>> this mistake. There's presumably something wrong with the way I'm
>> building the kernel.
>
> This build problem shows up when this driver is built into the kernel
> image, not built as a loadable module. Did you only build as a loadable
> module, maybe? and what CPU architecture did you build for? That could
> also matter.
Yes, that's it. I do development of the driver on a machine running
Debian stable with 2.6.26. I detect compilation and house-style
errors by copying the source into a clone of the linux-next tree and
running make and checkpatch.pl, but obviously I don't install. To
test the run-time behaviour of the driver I copy the driver source to a
separate (sacrificial) machine which is actually running linux-next and
build the driver there out-of-tree as a loadable module, complete with
the installation step. One machine is x86-64, the other is x86.
I'll change my way of working.
Mike
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (tty tree related)
From: Alan Cox @ 2010-11-12 10:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, Russ Gorby
In-Reply-To: <20101112125751.7f364d58.sfr@canb.auug.org.au>
On Fri, 12 Nov 2010 12:57:51 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/serial/ifx6x60.c: In function 'ifx_spi_reset':
> drivers/serial/ifx6x60.c:928: error: implicit declaration of function
> 'msleep'
Patch sent to Greg
Alan
^ permalink raw reply
* [PATCH -next] staging: fix ste_rmi4 build, depends on INPUT
From: Randy Dunlap @ 2010-11-12 22:47 UTC (permalink / raw)
To: Stephen Rothwell, gregkh, driverdevel
Cc: linux-next, LKML, naveen.gaddipati, js.ha
In-Reply-To: <20101111125655.15fa7188.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
The synaptics_i2c_rmi4 driver uses input_*() interfaces,
so it should depend on INPUT to fix its build errors:
ERROR: "input_event" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_free_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_register_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_set_abs_params" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_allocate_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_unregister_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: naveen.gaddipati@stericsson.com, js.ha@stericsson.com
---
drivers/staging/ste_rmi4/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20101111.orig/drivers/staging/ste_rmi4/Kconfig
+++ linux-next-20101111/drivers/staging/ste_rmi4/Kconfig
@@ -1,6 +1,6 @@
config TOUCHSCREEN_SYNAPTICS_I2C_RMI4
tristate "Synaptics i2c rmi4 touchscreen"
- depends on I2C
+ depends on I2C && INPUT
help
Say Y here if you have a Synaptics RMI4 and
want to enable support for the built-in touchscreen.
^ permalink raw reply
* [PATCH -next] edac: use BIT_64() to eliminate warnings
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
To: Stephen Rothwell, akpm; +Cc: Doug, LKML, linux-next, Thompson, bluesmoke-devel
In-Reply-To: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Building for X86_32 produces shift count warnings, so use
BIT_64() to eliminate the warnings.
drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: bluesmoke-devel@lists.sourceforge.net
---
drivers/edac/mce_amd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20101112.orig/drivers/edac/mce_amd.c
+++ linux-next-20101112/drivers/edac/mce_amd.c
@@ -776,8 +776,8 @@ int amd_decode_mce(struct notifier_block
if (c->x86 == 0x15)
pr_cont("|%s|%s",
- ((m->status & BIT(44)) ? "Deferred" : "-"),
- ((m->status & BIT(43)) ? "Poison" : "-"));
+ ((m->status & BIT_64(44)) ? "Deferred" : "-"),
+ ((m->status & BIT_64(43)) ? "Poison" : "-"));
/* do the two bits[14:13] together */
ecc = (m->status >> 45) & 0x3;
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
^ permalink raw reply
* [PATCH -next] iwlwifi: fix modular legacy build errors
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
To: Stephen Rothwell, linux-wireless-u79uwXL29TY76Z2rM5mHXA, akpm
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
linville-2XuSBdqkA4R54TAoqtyWWQ, einette Chatre, Wey-Yi Guy
In-Reply-To: <20101112130547.c2a3c2c1.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
With CONFIG_IWLWIFI=m, CONFIG_IWLAGN=m, and CONFIG_IWL3945=m,
a kernel build has errors as below. Changing a few lines in the
Makefile is one possible fix for these build errors.
ERROR: "iwl_legacy_mac_config" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_isr_legacy" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_tx_cmd_protection" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_mac_bss_info_changed" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_mac_reset_tsf" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
Cc: Reinette Chatre <reinette.chatre-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Wey-Yi Guy <wey-yi.w.guy-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/net/wireless/iwlwifi/Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- linux-next-20101112.orig/drivers/net/wireless/iwlwifi/Makefile
+++ linux-next-20101112/drivers/net/wireless/iwlwifi/Makefile
@@ -2,8 +2,6 @@ obj-$(CONFIG_IWLWIFI) += iwlcore.o
iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o
iwlcore-objs += iwl-scan.o iwl-led.o
-iwlcore-$(CONFIG_IWL3945) += iwl-legacy.o
-iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o
iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
@@ -17,7 +15,7 @@ iwlagn-objs += iwl-agn-lib.o iwl-agn-rx
iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o
iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o
-iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
+iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwl-legacy.o
iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o
iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
@@ -25,7 +23,7 @@ iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
# 3945
obj-$(CONFIG_IWL3945) += iwl3945.o
-iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o
+iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o iwl-legacy.o
iwl3945-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-3945-debugfs.o
ccflags-y += -D__CHECK_ENDIAN__
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH -next] pci-sysfs: fix printk warnings
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
To: Stephen Rothwell, linux-pci, akpm; +Cc: linux-next, LKML, Jesse Barnes
In-Reply-To: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Cast pci_resource_start() and pci_resource_len() to u64 for printk.
drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 9 has type 'resource_size_t'
drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 10 has type 'resource_size_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/pci/pci-sysfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- linux-next-20101112.orig/drivers/pci/pci-sysfs.c
+++ linux-next-20101112/drivers/pci/pci-sysfs.c
@@ -754,7 +754,8 @@ pci_mmap_resource(struct kobject *kobj,
"at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n",
current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff,
pci_name(pdev), i,
- pci_resource_start(pdev, i), pci_resource_len(pdev, i));
+ (u64)pci_resource_start(pdev, i),
+ (u64)pci_resource_len(pdev, i));
return -EINVAL;
}
^ permalink raw reply
* [PATCH -next] staging: fix iio/gyro typos, build errors
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
To: Stephen Rothwell, gregkh, driverdevel; +Cc: akpm, linux-next, LKML
In-Reply-To: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Typo causes build errors. Did anyone even build this driver?
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/iio/gyro/adis16251.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Also has section mismatch warnings:
WARNING: drivers/staging/built-in.o(.data+0xe9b8): Section mismatch in reference from the variable spi_adis16255_drv to the function .devinit.text:spi_adis16255_probe()
The variable spi_adis16255_drv references
the function __devinit spi_adis16255_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
WARNING: drivers/staging/built-in.o(.data+0xe9c0): Section mismatch in reference from the variable spi_adis16255_drv to the function .devexit.text:spi_adis16255_remove()
The variable spi_adis16255_drv references
the function __devexit spi_adis16255_remove()
If the reference is valid then annotate the
variable with __exit* (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
--- linux-next-20101112.orig/drivers/staging/iio/gyro/adis16251.h
+++ linux-next-20101112/drivers/staging/iio/gyro/adis16251.h
@@ -56,14 +56,14 @@
#define ADIS16251_DIAG_STAT_POWER_HIGH (1<<1)
#define ADIS16251_DIAG_STAT_POWER_LOW (1<<0)
-#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16261_DIAG_STAT_ALARM2 | \
- ADIS16261_DIAG_STAT_ALARM1 | \
- ADIS16261_DIAG_STAT_SELF_TEST | \
- ADIS16261_DIAG_STAT_OVERFLOW | \
- ADIS16261_DIAG_STAT_SPI_FAIL | \
- ADIS16261_DIAG_STAT_FLASH_UPT | \
- ADIS16261_DIAG_STAT_POWER_HIGH | \
- ADIS16261_DIAG_STAT_POWER_LOW)
+#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16251_DIAG_STAT_ALARM2 | \
+ ADIS16251_DIAG_STAT_ALARM1 | \
+ ADIS16251_DIAG_STAT_SELF_TEST | \
+ ADIS16251_DIAG_STAT_OVERFLOW | \
+ ADIS16251_DIAG_STAT_SPI_FAIL | \
+ ADIS16251_DIAG_STAT_FLASH_UPT | \
+ ADIS16251_DIAG_STAT_POWER_HIGH | \
+ ADIS16251_DIAG_STAT_POWER_LOW)
/* GLOB_CMD */
#define ADIS16251_GLOB_CMD_SW_RESET (1<<7)
^ permalink raw reply
* [PATCH -next] xen: fix header export to userspace
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
To: Stephen Rothwell, akpm
Cc: xen-devel, Jeremy, Fitzhardinge, Konrad Rzeszutek Wilk,
Tony Finch, LKML, virtualization, linux-next
In-Reply-To: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
scripts/headers_install.pl prevents "__user" from being exported
to userspace headers, so just use compiler.h to make sure that
__user is defined and avoid the error.
unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xensource.com (moderated for non-subscribers)
Cc: virtualization@lists.osdl.org
Cc: Tony Finch <dot@dotat.at>
---
include/xen/privcmd.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- linux-next-20101112.orig/include/xen/privcmd.h
+++ linux-next-20101112/include/xen/privcmd.h
@@ -34,13 +34,10 @@
#define __LINUX_PUBLIC_PRIVCMD_H__
#include <linux/types.h>
+#include <linux/compiler.h>
typedef unsigned long xen_pfn_t;
-#ifndef __user
-#define __user
-#endif
-
struct privcmd_hypercall {
__u64 op;
__u64 arg[5];
^ permalink raw reply
* [PATCH -next] x86/mrst: force support code to be built
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
To: Stephen Rothwell, akpm; +Cc: linux-next, LKML, x86
In-Reply-To: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix mrst.c build: make sure that its called functions are built.
arch/x86/built-in.o: In function `mrst_reboot':
mrst.c:(.text+0x2250b): undefined reference to `intel_scu_ipc_simple_command'
arch/x86/built-in.o: In function `mrst_power_off':
mrst.c:(.text+0x2252e): undefined reference to `intel_scu_ipc_simple_command'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
arch/x86/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20101112.orig/arch/x86/Kconfig
+++ linux-next-20101112/arch/x86/Kconfig
@@ -387,6 +387,7 @@ config X86_MRST
select APB_TIMER
select I2C
select SPI
+ select X86_PLATFORM_DEVICES
---help---
Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
Internet Device(MID) platform. Moorestown consists of two chips:
^ permalink raw reply
* Re: [PATCH -next] edac: use BIT_64() to eliminate warnings
From: Borislav Petkov @ 2010-11-14 17:54 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, akpm, linux-next@vger.kernel.org, LKML,
Doug Thompson, bluesmoke-devel@lists.sourceforge.net, edac-devel
In-Reply-To: <20101113084426.b26f1d88.randy.dunlap@oracle.com>
On Sat, Nov 13, 2010 at 11:44:26AM -0500, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Building for X86_32 produces shift count warnings, so use
> BIT_64() to eliminate the warnings.
>
> drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
> drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Doug Thompson <dougthompson@xmission.com>
> Cc: Borislav Petkov <borislav.petkov@amd.com>
> Cc: bluesmoke-devel@lists.sourceforge.net
Thanks, applied.
BTW, Doug, we still carry the bluesmoke-devel ML as edac mailing list
in MAINTAINERS althouth there's a new linux-edac@vger... which got
proposed recently. I think we should use that new one and deprecate the
sourceforge list since the new one is not moderated for subsribers and
thus more open.
Thoughts?
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
^ permalink raw reply
* linux-next: failed to fetch the davinci tree
From: Stephen Rothwell @ 2010-11-14 22:20 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
Hi Kevin,
Trying to fetch the davinci tree this morning produced this error:
fatal: Couldn't find remote ref refs/heads/davinci-next
I will use the tree from next-20101112 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2010-11-14 23:25 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Patrick Boettcher, Martin Wilks
[-- Attachment #1: Type: text/plain, Size: 2265 bytes --]
Hi Mauro,
After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/media/dvb/dvb-usb/technisat-usb2.c: In function 'technisat_usb2_get_ir':
drivers/media/dvb/dvb-usb/technisat-usb2.c:643: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
drivers/media/dvb/dvb-usb/technisat-usb2.c:649: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
drivers/media/dvb/dvb-usb/technisat-usb2.c:654: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
drivers/media/dvb/dvb-usb/technisat-usb2.c: At top level:
drivers/media/dvb/dvb-usb/technisat-usb2.c:732: error: unknown field 'rc_props' specified in initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: braces around scalar initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: field name not in record or union initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: field name not in record or union initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: excess elements in scalar initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
make[5]: *** No rule to make target `drivers/media/rc/keymaps/rc-technisat-usb2.c', needed by `drivers/media/rc/keymaps/rc-technisat-usb2.o'. Stop.
Caused by commit f29235d71ad3995ef9f74ad2f5931eca4ecabdcd ("[media]
technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver")
interacting with commit 1639cc0c5348957c076c0304005632d4a1b63252
("[media] ir-core: make struct rc_dev the primary interface").
Please make sure your build tests build new/modified files.
I have used the v4l-dvb tree from next-20101112 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the xen tree with Linus' tree
From: Stephen Rothwell @ 2010-11-15 0:23 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Xen Devel
Cc: linux-next, linux-kernel, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi all,
Today's linux-next merge of the xen tree got a conflict in
drivers/block/xen-blkfront.c between commit
02e031cbc843b010e72fcc05c76113c688b2860f ("block: remove
REQ_HARDBARRIER") from Linus' tree and commits
c64e38ea17a81721da0393584fd807f8434050fa ("xen/blkfront: map REQ_FLUSH
into a full barrier") and be2f8373c188ed1f5d36003c9928e4d695213080
("xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER") from the xen
tree.
I used the xen tree version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell @ 2010-11-15 0:46 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet
[-- Attachment #1: Type: text/plain, Size: 2309 bytes --]
Hi Dave,
After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:
net/ipv4/igmp.c: In function 'ip_mc_inc_group':
net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl'
net/ipv4/igmp.c:1228: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_unmap':
net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped'
net/ipv4/igmp.c: In function 'ip_mc_remap':
net/ipv4/igmp.c:1343: error: expected ';' before 'igmp_group_added'
net/ipv4/igmp.c: In function 'ip_mc_down':
net/ipv4/igmp.c:1355: error: expected ';' before 'igmp_group_dropped'
net/ipv4/igmp.c: In function 'ip_mc_up':
net/ipv4/igmp.c:1400: error: expected ';' before 'igmp_group_added'
net/ipv4/igmp.c: In function 'ip_mc_del_src':
net/ipv4/igmp.c:1521: error: implicit declaration of function 'for_each_pmc_rcu'
net/ipv4/igmp.c:1521: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_add_src':
net/ipv4/igmp.c:1693: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_join_group':
net/ipv4/igmp.c:1800: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_source':
net/ipv4/igmp.c:1938: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_msfilter':
net/ipv4/igmp.c:2081: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_msfget':
net/ipv4/igmp.c:2159: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_gsfget':
net/ipv4/igmp.c:2212: error: expected ';' before '{' token
net/ipv4/igmp.c:2240: warning: label 'done' defined but not used
net/ipv4/igmp.c: In function 'ip_mc_sf_allow':
net/ipv4/igmp.c:2261: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_check_mc':
net/ipv4/igmp.c:2326: error: expected ';' before '{' token
net/ipv4/igmp.c:2322: warning: unused variable 'psf'
Caused by commit 1d7138de878d1d4210727c1200193e69596f93b3 ("igmp: RCU
conversion of in_dev->mc_list"). The for_each_pmc_rtnl and
for_each_pmc_rcu definitions are protected by CONFIG_IP_MULTICAST, but
the uses are not ...
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ 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