* [PATCH net-next] wan: dlci/sdla transmit return dehacking
From: Stephen Hemminger @ 2009-09-04 15:33 UTC (permalink / raw)
To: David Miller, Krzysztof Halasa; +Cc: sfr, linux-next, netdev
In-Reply-To: <20090903.213548.46609322.davem@davemloft.net>
This is a brute force removal of the wierd slave interface done for DLCI -> SDLA
transmit. Before it was using non-standard return values and freeing skb in caller.
This changes it to using normal return values, and freeing in the callee.
Luckly only one driver pair was doing this. Not tested on real hardware,
in fact I wonder if this driver pair is even being used by any users.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
drivers/net/wan/dlci.c | 43 +++++--------------------------------------
drivers/net/wan/sdla.c | 8 ++++----
include/linux/if_frad.h | 5 -----
3 files changed, 9 insertions(+), 47 deletions(-)
--- a/drivers/net/wan/dlci.c 2009-09-04 08:14:38.993377174 -0700
+++ b/drivers/net/wan/dlci.c 2009-09-04 08:25:03.024404089 -0700
@@ -186,46 +186,13 @@ static void dlci_receive(struct sk_buff
dev_kfree_skb(skb);
}
-static netdev_tx_t dlci_transmit(struct sk_buff *skb,
- struct net_device *dev)
+static netdev_tx_t dlci_transmit(struct sk_buff *skb, struct net_device *dev)
{
- struct dlci_local *dlp;
- netdev_tx_t ret;
-
- if (!skb || !dev)
- return NETDEV_TX_OK;
-
- dlp = netdev_priv(dev);
-
- netif_stop_queue(dev);
-
- /* This is hackish, overloads driver specific return values
- on top of normal transmit return! */
- ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
- switch (ret)
- {
- case DLCI_RET_OK:
- dev->stats.tx_packets++;
- ret = NETDEV_TX_OK;
- break;
- case DLCI_RET_ERR:
- dev->stats.tx_errors++;
- ret = NETDEV_TX_OK;
- break;
- case DLCI_RET_DROP:
- dev->stats.tx_dropped++;
- ret = NETDEV_TX_BUSY;
- break;
- }
- /* Alan Cox recommends always returning 0, and always freeing the packet */
- /* experience suggest a slightly more conservative approach */
+ struct dlci_local *dlp = netdev_priv(dev);
- if (ret == NETDEV_TX_OK)
- {
- dev_kfree_skb(skb);
- netif_wake_queue(dev);
- }
- return(ret);
+ if (skb)
+ dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
+ return NETDEV_TX_OK;
}
static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, int get)
--- a/drivers/net/wan/sdla.c 2009-09-04 08:18:22.917065991 -0700
+++ b/drivers/net/wan/sdla.c 2009-09-04 08:24:53.587189004 -0700
@@ -652,7 +652,7 @@ static int sdla_dlci_conf(struct net_dev
/* NOTE: the DLCI driver deals with freeing the SKB!! */
static netdev_tx_t sdla_transmit(struct sk_buff *skb,
- struct net_device *dev)
+ struct net_device *dev)
{
struct frad_local *flp;
int ret, addr, accept, i;
@@ -712,23 +712,21 @@ static netdev_tx_t sdla_transmit(struct
}
break;
}
+
switch (ret)
{
case SDLA_RET_OK:
dev->stats.tx_packets++;
- ret = DLCI_RET_OK;
break;
case SDLA_RET_CIR_OVERFLOW:
case SDLA_RET_BUF_OVERSIZE:
case SDLA_RET_NO_BUFS:
dev->stats.tx_dropped++;
- ret = DLCI_RET_DROP;
break;
default:
dev->stats.tx_errors++;
- ret = DLCI_RET_ERR;
break;
}
}
@@ -738,6 +736,8 @@ static netdev_tx_t sdla_transmit(struct
if(flp->master[i]!=NULL)
netif_wake_queue(flp->master[i]);
}
+
+ dev_kfree_skb(skb);
return NETDEV_TX_OK;
}
--- a/include/linux/if_frad.h 2009-09-04 08:19:04.459045748 -0700
+++ b/include/linux/if_frad.h 2009-09-04 08:19:47.487006328 -0700
@@ -69,11 +69,6 @@ struct dlci_conf {
#define DLCI_VALID_FLAGS 0x000B
-/* FRAD driver uses these to indicate what it did with packet */
-#define DLCI_RET_OK 0x00
-#define DLCI_RET_ERR 0x01
-#define DLCI_RET_DROP 0x02
-
/* defines for the actual Frame Relay hardware */
#define FRAD_GET_CONF (SIOCDEVPRIVATE)
#define FRAD_SET_CONF (SIOCDEVPRIVATE + 1)
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the net tree
From: Greg KH @ 2009-09-04 14:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Stephen Hemminger, Patrick McHardy,
David S. Miller
In-Reply-To: <20090904173225.0817003b.sfr@canb.auug.org.au>
On Fri, Sep 04, 2009 at 05:32:25PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/at76_usb/at76_usb.c between commits
> 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
> of 0 in ndo_start_xmit() functions") and
> 0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec ("netdev: drivers should make
> ethtool_ops const") from the net tree and commit
> c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 ("Staging: remove at76_usb
> wireless driver") from the staging tree.
>
> The latter just removes the driver, so I did that.
Thanks, that's an easy fix :)
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for September 4
From: Borislav Petkov @ 2009-09-04 10:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20090904182309.dbb05c96.sfr@canb.auug.org.au>
Hi Stephen,
On Fri, Sep 04, 2009 at 06:23:09PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090903:
..
> Merging edac-amd/for-next
> CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
> CONFLICT (content): Merge conflict in include/linux/topology.h
current topology patches in -tip have significantly diverged from the
versions I carry in the edac tree so please remove the last from the
testing lineup temporarily. Will fix the issue after I'm back from my
vacation the week after next.
Thanks.
--
Regards/Gruss,
Boris.
Operating | Advanced Micro Devices GmbH
System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany
Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
(OSRC) | Registergericht München, HRB Nr. 43632
^ permalink raw reply
* Re: [Patch -next] Fix net/3c503.c build break
From: David Miller @ 2009-09-04 10:41 UTC (permalink / raw)
To: sachinp; +Cc: netdev, linux-next
In-Reply-To: <4AA0ED92.6070306@in.ibm.com>
From: Sachin Sant <sachinp@in.ibm.com>
Date: Fri, 04 Sep 2009 16:06:02 +0530
> Today's Next failed to build on a x86 box with following error.
>
> drivers/net/3c503.c: In function 'el2_open':
> drivers/net/3c503.c:406: error: 'reval' undeclared (first use in this
> function)
> drivers/net/3c503.c:406: error: (Each undeclared identifier is
> reported only once
> drivers/net/3c503.c:406: error: for each function it appears in.)
>
> Most probably because of commit
> ab08999d6029bb2c79c16be5405d63d2bedbdfea
> The patch had a typo in it. Below patch fixes the issue for me.
Applied, thank you.
^ permalink raw reply
* [Patch -next] Fix net/3c503.c build break
From: Sachin Sant @ 2009-09-04 10:36 UTC (permalink / raw)
To: netdev; +Cc: linux-next, David Miller
In-Reply-To: <20090904182309.dbb05c96.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
Today's Next failed to build on a x86 box with following error.
drivers/net/3c503.c: In function 'el2_open':
drivers/net/3c503.c:406: error: 'reval' undeclared (first use in this function)
drivers/net/3c503.c:406: error: (Each undeclared identifier is reported only once
drivers/net/3c503.c:406: error: for each function it appears in.)
Most probably because of commit ab08999d6029bb2c79c16be5405d63d2bedbdfea
The patch had a typo in it. Below patch fixes the issue for me.
Thanks
-Sachin
[-- Attachment #2: net-3c503-typo-fix.patch --]
[-- Type: text/x-patch, Size: 497 bytes --]
Fix a build break because of a typo in drivers/net/3c503.c
Signed-off-by: Sachin Sant <sachinp@in.ibm.com>
---
diff -Naurp a/drivers/net/3c503.c b/drivers/net/3c503.c
--- a/drivers/net/3c503.c 2009-09-04 15:50:06.000000000 +0530
+++ b/drivers/net/3c503.c 2009-09-04 15:50:41.000000000 +0530
@@ -403,7 +403,7 @@ el2_open(struct net_device *dev)
break;
} else {
if (retval != -EBUSY)
- return reval;
+ return retval;
}
} while (*++irqp);
if (*irqp == 0) {
^ permalink raw reply
* Re: linux-next: block tree build warning
From: Stephen Rothwell @ 2009-09-04 8:27 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
In-Reply-To: <20090904075726.GS18599@kernel.dk>
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
Hi Jens,
On Fri, 4 Sep 2009 09:57:27 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> This is now fixed, I'll push out a new for-next in 2 seconds... And
> done, should be OK now.
Thanks, I will pick up this version (or whatever version you are up
to :-)) on Monday.
--
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
* linux-next: Tree for September 4
From: Stephen Rothwell @ 2009-09-04 8:23 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8883 bytes --]
Hi all,
Changes since 20090903:
The xfs tree gained a conflict against the ext3 tree.
The acpi tree still has a build failure so I used the version from
next-20090831.
The security-testing tree still has a build failure so I used the version
of the tree from next-20090902.
The staging tree gained a conflict against the net tree.
----------------------------------------------------------------------------
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 141 trees (counting Linus' and 21 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 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 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 thumb-2/thumb-2
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
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
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
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
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
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
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/gspca/Kconfig
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090831/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
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
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ubifs/super.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 kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
CONFLICT (content): Merge conflict in arch/arm/kernel/signal.c
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Applying: security: fix merge for tun_struct changes
$ git reset --hard HEAD^
Merging refs/next/20090902/security-testing
Applying: security: fix merge for tun_struct changes
Merging lblnet/master
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging agp/agp-next
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
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/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in kernel/sched.c
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/at76_usb/at76_usb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/at76_usb/at76_usb.c left in tree.
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
$ git rm -f drivers/staging/at76_usb/at76_usb.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the xfs tree with the ext3 tree
From: Jan Kara @ 2009-09-04 8:11 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Stephen Rothwell, David Chinner, xfs-masters, linux-next,
linux-kernel, Jan Kara, Felix Blyakher
In-Reply-To: <20090903235652.GA7674@lst.de>
On Fri 04-09-09 01:56:52, Christoph Hellwig wrote:
> On Fri, Sep 04, 2009 at 09:55:00AM +1000, Stephen Rothwell wrote:
> > 218604a0bf712976171798b1dd5c44d26d6d0ea4 ("xfs: Convert sync_page_range()
> > to simple filemap_write_and_wait_range()") from the ext3 tree and commit
> > 13e6d5cdde0e785aa943810f08b801cadd0935df ("xfs: merge fsync and O_SYNC
> > handling") from the xfs tree.
> >
> > They both do the same thing (to this bit of code) ... I used the version
> > from the xfs tree.
>
> Yes, the xfs tree one is the better one, the one in Jan's tree only
> does about half of it.
Should I drop the XFS chunk or will you rebase your XFS patch on top of
my patch? The latter seems safer (since my patch series won't compile
without the XFS change)...
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply
* Re: linux-next: block tree build warning
From: Jens Axboe @ 2009-09-04 7:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090904175440.09a67ee7.sfr@canb.auug.org.au>
On Fri, Sep 04 2009, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next build (powerpc allnoconfig) produced this warning:
>
> fs/fs-writeback.c: In function 'sync_inodes_sb':
> fs/fs-writeback.c:1140: warning: overflow in implicit constant conversion
>
> Introduced by commit bda31e6ac21d7d41525c4e57549ac24bacdcf622
> ("writeback: get rid of generic_sync_sb_inodes() export"). This is a
> 32bit build.
This is now fixed, I'll push out a new for-next in 2 seconds... And
done, should be OK now.
--
Jens Axboe
^ permalink raw reply
* linux-next: block tree build warning
From: Stephen Rothwell @ 2009-09-04 7:54 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
Hi Jens,
Today's linux-next build (powerpc allnoconfig) produced this warning:
fs/fs-writeback.c: In function 'sync_inodes_sb':
fs/fs-writeback.c:1140: warning: overflow in implicit constant conversion
Introduced by commit bda31e6ac21d7d41525c4e57549ac24bacdcf622
("writeback: get rid of generic_sync_sb_inodes() export"). This is a
32bit build.
--
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
* linux-next: manual merge of the staging tree with the net tree
From: Stephen Rothwell @ 2009-09-04 7:32 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Stephen Hemminger, Patrick McHardy,
David S. Miller
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/at76_usb/at76_usb.c between commits
6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
of 0 in ndo_start_xmit() functions") and
0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec ("netdev: drivers should make
ethtool_ops const") from the net tree and commit
c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 ("Staging: remove at76_usb
wireless driver") from the staging tree.
The latter just removes the driver, so I did that.
--
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: linux-next: net tree build warnings
From: David Miller @ 2009-09-04 4:35 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, shemminger, netdev
In-Reply-To: <20090904143439.c44f61ee.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Sep 2009 14:34:39 +1000
> Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced thes
> warnings:
>
> drivers/net/wan/dlci.c: In function 'dlci_transmit':
> drivers/net/wan/dlci.c:205: warning: enumeration value 'NETDEV_TX_LOCKED' not handled in switch
> drivers/net/wan/dlci.c:215: warning: case value '2' not in enumerated type 'netdev_tx_t'
>
> Introduced by commit d71a674922e7519edb477ecb585e7d29d69c7aa7 ("wan:
> convert drivers to netdev_tx_t").
I know about it, this code sucks and it's not easy to quelch that
one trivially.
^ permalink raw reply
* Re: linux-next: net tree build warning
From: David Miller @ 2009-09-04 4:35 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, roel.kluin, netdev
In-Reply-To: <20090904142846.02ad1b23.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Sep 2009 14:28:46 +1000
> Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced this
> warning:
Thanks, just pushed the following out:
WAN: dscc4: Fix warning pointing out a bug.
Noticed by Stephen Rothwell:
Today's linux-next build (x86_64 allmodconfig gcc-4.4.0)
produced this warning:
drivers/net/wan/dscc4.c: In function 'dscc4_rx_skb':
drivers/net/wan/dscc4.c:670: warning: suggest parentheses around comparison in operand of '|'
which actually points out a bug, I think. It is doing
(x & (y | z)) != y | z
when it probably means
(x & (y | z)) != (y | z)
Introduced by commit 5de3fcab91b0e1809eec030355d15801daf25083
("WAN: bit and/or confusion").
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/wan/dscc4.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index b2247bd..81c8aec 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -667,7 +667,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
else if (!(skb->data[pkt_len] & FrameCrc))
dev->stats.rx_crc_errors++;
else if ((skb->data[pkt_len] & (FrameVfr | FrameRab)) !=
- FrameVfr | FrameRab)
+ (FrameVfr | FrameRab))
dev->stats.rx_length_errors++;
dev->stats.rx_errors++;
dev_kfree_skb_irq(skb);
--
1.6.4.2
^ permalink raw reply related
* linux-next: net tree build warnings
From: Stephen Rothwell @ 2009-09-04 4:34 UTC (permalink / raw)
To: David S. Miller; +Cc: linux-next, linux-kernel, Stephen Hemminger, netdev
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Dave,
Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced thes
warnings:
drivers/net/wan/dlci.c: In function 'dlci_transmit':
drivers/net/wan/dlci.c:205: warning: enumeration value 'NETDEV_TX_LOCKED' not handled in switch
drivers/net/wan/dlci.c:215: warning: case value '2' not in enumerated type 'netdev_tx_t'
Introduced by commit d71a674922e7519edb477ecb585e7d29d69c7aa7 ("wan:
convert drivers to netdev_tx_t").
--
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
* linux-next: net tree build warning
From: Stephen Rothwell @ 2009-09-04 4:28 UTC (permalink / raw)
To: David S. Miller; +Cc: linux-next, linux-kernel, roel kluin, netdev
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi Dave,
Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced this
warning:
drivers/net/wan/dscc4.c: In function 'dscc4_rx_skb':
drivers/net/wan/dscc4.c:670: warning: suggest parentheses around comparison in operand of '|'
which actually points out a bug, I think. It is doing
(x & (y | z)) != y | z
when it probably means
(x & (y | z)) != (y | z)
Introduced by commit 5de3fcab91b0e1809eec030355d15801daf25083 ("WAN: bit
and/or confusion").
--
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: linux-next: manual merge of the xfs tree with the ext3 tree
From: Christoph Hellwig @ 2009-09-03 23:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Chinner, xfs-masters, linux-next, linux-kernel, Jan Kara,
Christoph Hellwig, Felix Blyakher
In-Reply-To: <20090904095500.04205407.sfr@canb.auug.org.au>
On Fri, Sep 04, 2009 at 09:55:00AM +1000, Stephen Rothwell wrote:
> 218604a0bf712976171798b1dd5c44d26d6d0ea4 ("xfs: Convert sync_page_range()
> to simple filemap_write_and_wait_range()") from the ext3 tree and commit
> 13e6d5cdde0e785aa943810f08b801cadd0935df ("xfs: merge fsync and O_SYNC
> handling") from the xfs tree.
>
> They both do the same thing (to this bit of code) ... I used the version
> from the xfs tree.
Yes, the xfs tree one is the better one, the one in Jan's tree only
does about half of it.
^ permalink raw reply
* linux-next: manual merge of the xfs tree with the ext3 tree
From: Stephen Rothwell @ 2009-09-03 23:55 UTC (permalink / raw)
To: David Chinner, xfs-masters
Cc: linux-next, linux-kernel, Jan Kara, Christoph Hellwig,
Felix Blyakher
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
Hi all,
Today's linux-next merge of the xfs tree got a conflict in
fs/xfs/linux-2.6/xfs_lrw.c between commit
218604a0bf712976171798b1dd5c44d26d6d0ea4 ("xfs: Convert sync_page_range()
to simple filemap_write_and_wait_range()") from the ext3 tree and commit
13e6d5cdde0e785aa943810f08b801cadd0935df ("xfs: merge fsync and O_SYNC
handling") from the xfs tree.
They both do the same thing (to this bit of code) ... I used the version
from the xfs tree.
--
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: linux-next / s390 crypto breakage
From: Jan Glauber @ 2009-09-03 15:52 UTC (permalink / raw)
To: Herbert Xu; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
In-Reply-To: <20090902220447.GA17101@gondor.apana.org.au>
On Thu, 2009-09-03 at 08:04 +1000, Herbert Xu wrote:
> On Wed, Sep 02, 2009 at 05:57:25PM +0000, Jan Glauber wrote:
> > That patch should fix the warnings.
>
> Thanks, but where is the sign-off :)
Oops. I need a script for that...
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
^ permalink raw reply
* Re: linux-next: security-testing/net tree build failure
From: Stephen Rothwell @ 2009-09-03 13:31 UTC (permalink / raw)
To: Paul Moore; +Cc: David Miller, jmorris, linux-next, linux-kernel, mst
In-Reply-To: <200909030910.20884.paul.moore@hp.com>
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
On Thu, 3 Sep 2009 09:10:20 -0400 Paul Moore <paul.moore@hp.com> wrote:
>
> On Thursday 03 September 2009 02:16:07 am David Miller wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 3 Sep 2009 16:14:32 +1000
> >
> > > I applied the following merge fix patch (which I can carry as necessary):
> >
> > Looks good from here, thanks Stephen.
>
> Looks good over here too, thanks.
Thanks for the confirmations.
--
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: linux-next: security-testing/net tree build failure
From: Paul Moore @ 2009-09-03 13:10 UTC (permalink / raw)
To: sfr; +Cc: David Miller, jmorris, linux-next, linux-kernel, mst
In-Reply-To: <20090902.231607.200932036.davem@davemloft.net>
On Thursday 03 September 2009 02:16:07 am David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 3 Sep 2009 16:14:32 +1000
>
> > I applied the following merge fix patch (which I can carry as necessary):
>
> Looks good from here, thanks Stephen.
Looks good over here too, thanks.
--
paul moore
linux @ hp
^ permalink raw reply
* Re: linux-next: tip tree build warnings
From: Heiko Carstens @ 2009-09-03 12:24 UTC (permalink / raw)
To: Ingo Molnar
Cc: Stephen Rothwell, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Xiao Guangrong, Martin Schwidefsky
In-Reply-To: <20090903121326.GA4724@osiris.boeblingen.de.ibm.com>
On Thu, Sep 03, 2009 at 02:13:26PM +0200, Heiko Carstens wrote:
> On Thu, Sep 03, 2009 at 10:38:44AM +0200, Ingo Molnar wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > Today's linux-next build (powerpc ppc64_defconfig) produced these warning:
> > >
> > > In file included from include/trace/ftrace.h:285,
> > > from include/trace/define_trace.h:61,
> > > from include/trace/events/timer.h:342,
> > > from kernel/timer.c:50:
> > > include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_state':
> > > include/trace/events/timer.h:280: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'cputime_t'
> > > include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_expire':
> > > include/trace/events/timer.h:317: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'cputime_t'
> >
> > Should be harmless with no runtime effects - the fix would be to
> > harmonize the cputime_t types across architectures.
> >
> > > Introduced by commit 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b ("timers: Add tracepoints for itimer") from the tip tree.
> > >
> > > cputime_t is variously "u64", "unsigned long long" and "unsigned
> > > long" on different architectures.
> >
> > Should be unsigned long i think. Most architectures use it as
> > unsigned long via include/asm-generic/cputime.h, except these three:
> >
> > arch/ia64/include/asm/cputime.h:typedef u64 cputime_t;
> > arch/powerpc/include/asm/cputime.h:typedef u64 cputime_t;
> > arch/s390/include/asm/cputime.h:typedef unsigned long long cputime_t;
> >
> > Or we could eliminate the type altogether as well and standardize on
> > u64. Thomas?
>
> s390 uses 64 bit cputime_t because we want the high resolution also in
> 32 bit kernels. So standardizing on u64 would be the preferred solution
> for us.
Alternatively the tracepoints could simply use cputime_to_cputime64.
But that would be too easy I guess? ;)
^ permalink raw reply
* Re: linux-next: tip tree build warnings
From: Heiko Carstens @ 2009-09-03 12:13 UTC (permalink / raw)
To: Ingo Molnar
Cc: Stephen Rothwell, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Xiao Guangrong, Martin Schwidefsky
In-Reply-To: <20090903083844.GA9912@elte.hu>
On Thu, Sep 03, 2009 at 10:38:44AM +0200, Ingo Molnar wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next build (powerpc ppc64_defconfig) produced these warning:
> >
> > In file included from include/trace/ftrace.h:285,
> > from include/trace/define_trace.h:61,
> > from include/trace/events/timer.h:342,
> > from kernel/timer.c:50:
> > include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_state':
> > include/trace/events/timer.h:280: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'cputime_t'
> > include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_expire':
> > include/trace/events/timer.h:317: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'cputime_t'
>
> Should be harmless with no runtime effects - the fix would be to
> harmonize the cputime_t types across architectures.
>
> > Introduced by commit 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b ("timers: Add tracepoints for itimer") from the tip tree.
> >
> > cputime_t is variously "u64", "unsigned long long" and "unsigned
> > long" on different architectures.
>
> Should be unsigned long i think. Most architectures use it as
> unsigned long via include/asm-generic/cputime.h, except these three:
>
> arch/ia64/include/asm/cputime.h:typedef u64 cputime_t;
> arch/powerpc/include/asm/cputime.h:typedef u64 cputime_t;
> arch/s390/include/asm/cputime.h:typedef unsigned long long cputime_t;
>
> Or we could eliminate the type altogether as well and standardize on
> u64. Thomas?
s390 uses 64 bit cputime_t because we want the high resolution also in
32 bit kernels. So standardizing on u64 would be the preferred solution
for us.
^ permalink raw reply
* linux-next: Tree for September 3
From: Stephen Rothwell @ 2009-09-03 11:59 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8825 bytes --]
Hi all,
Changes since 20090902:
The xfs tree lost its build failure.
The acpi tree still has a build failure so I used the version from
next-20090831.
The net tree lost its conflict.
The security-testing tree gained conflicts against the arm and parisc
trees and also a build failure so I used the version of the tree from
next-20090902. There was another build failure due to an interaction with
the net tree for which I applied a merge fix.
The tip tree gained a conflict against the rr tree.
The percpu tree gained a conflict against the tip tree.
The sfi tree gained a conflict against the tip tree.
----------------------------------------------------------------------------
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 141 trees (counting Linus' and 21 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 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 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 thumb-2/thumb-2
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
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
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
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
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
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 arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/gspca/Kconfig
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090831/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
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
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ubifs/super.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 kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
CONFLICT (content): Merge conflict in arch/arm/kernel/signal.c
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
$ git reset --hard HEAD^
Merging refs/next/20090902/security-testing
Applying: security: fix merge for tun_struct changes
Merging lblnet/master
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging agp/agp-next
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
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/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in kernel/sched.c
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the sfi tree with the tip tree
From: Stephen Rothwell @ 2009-09-03 9:34 UTC (permalink / raw)
To: sfi-devel
Cc: linux-next, linux-kernel, Feng Tang, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
Hi all,
Today's linux-next merge of the sfi tree got a conflict in
arch/x86/kernel/setup.c between commit
b3f1b617f49447df6c3f5fac9c225aaea8b724ea ("x86: Move get/find_smp_config
to x86_init_ops") from the tip tree and commit
efafc8b213e67ed148a5b53ade29ee7b48af907d ("x86: add arch-specific SFI
support") from the sfi tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/setup.c
index a55f660,d784ea2..0000000
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -984,7 -990,10 +985,9 @@@ void __init setup_arch(char **cmdline_p
* Read APIC and some other early information from ACPI tables.
*/
acpi_boot_init();
+
+ sfi_init();
-#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
/*
* get boot-time SMP configuration:
*/
^ permalink raw reply
* linux-next: manual merge of the percpu tree with the tip tree
From: Stephen Rothwell @ 2009-09-03 9:11 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Anirban Sinha, Thomas Gleixner,
H. Peter Anvin, Peter Zijlstra
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
kernel/sched.c between commit 84e9dabf6e6a78928c6a1a8ba235c9fb0908d0f8
("sched: Rename init_cfs_rq => init_tg_cfs_rq") from the tip tree and
commit b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
DEFINE_PER_CPU_SHARED_ALIGNED()") from the percpu tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/sched.c
index 4061929,d3d7e76..0000000
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -318,7 -318,7 +318,7 @@@ struct task_group root_task_group
/* Default task group's sched entity on each cpu */
static DEFINE_PER_CPU(struct sched_entity, init_sched_entity);
/* Default task group's cfs_rq on each cpu */
- static DEFINE_PER_CPU(struct cfs_rq, init_tg_cfs_rq) ____cacheline_aligned_in_smp;
-static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_cfs_rq);
++static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_tg_cfs_rq);
#endif /* CONFIG_FAIR_GROUP_SCHED */
#ifdef CONFIG_RT_GROUP_SCHED
^ 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