commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit c7ebf0657b1f47d85aee8349ed6345d940d7232a Author: Randy Dunlap <randy.dunlap(a)oracle.com> Date: Mon Oct 12 08:20:47 2009 +0200 blk-settings: fix function parameter kernel-doc notation Fix kernel-doc notation in blk-settings.c::blk_queue_max_discard_sectors(). Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Signed-off-by: Jens Axboe <jens.axboe(a)oracle.com> diff --git a/block/blk-settings.c b/block/blk-settings.c index e0695bc..66d4aa8 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -242,7 +242,7 @@ EXPORT_SYMBOL(blk_queue_max_hw_sectors); /** * blk_queue_max_discard_sectors - set max sectors for a single discard * @q: the request queue for the device - * @max_discard: maximum number of sectors to discard + * @max_discard_sectors: maximum number of sectors to discard **/ void blk_queue_max_discard_sectors(struct request_queue *q, unsigned int max_discard_sectors) -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 5fdb9973c10c2d2e046da0976782ece25e78dc8b Author: Eric Dumazet <eric.dumazet(a)gmail.com> Date: Thu Oct 8 22:50:25 2009 +0000 net: Fix struct sock bitfield annotation Since commit a98b65a3 (net: annotate struct sock bitfield), we lost 8 bytes in struct sock on 64bit arches because of kmemcheck_bitfield_end(flags) misplacement. Fix this by putting together sk_shutdown, sk_no_check, sk_userlocks, sk_protocol and sk_type in the 'flags' 32bits bitfield Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/include/net/sock.h b/include/net/sock.h index 1621935..9f96394 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -226,12 +226,12 @@ struct sock { #define sk_prot __sk_common.skc_prot #define sk_net __sk_common.skc_net kmemcheck_bitfield_begin(flags); - unsigned char sk_shutdown : 2, - sk_no_check : 2, - sk_userlocks : 4; + unsigned int sk_shutdown : 2, + sk_no_check : 2, + sk_userlocks : 4, + sk_protocol : 8, + sk_type : 16; kmemcheck_bitfield_end(flags); - unsigned char sk_protocol; - unsigned short sk_type; int sk_rcvbuf; socket_lock_t sk_lock; /* -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit cbef79a82a64ec13e745ce2b0274154ae1e47243 Author: Randy Dunlap <randy.dunlap(a)oracle.com> Date: Mon Oct 5 13:17:29 2009 -0700 perf tools: Fix const char type propagation The following perf build warnings/errors in function argument types: builtin-sched.c:1894: warning: passing argument 1 of 'sort_dimension__add' discards qualifiers from pointer target type util/trace-event-parse.c:685: warning: passing argument 2 of 'read_expected' discards qualifiers from pointer target type util/trace-event-parse.c:741: warning: passing argument 4 of 'test_type_token' discards qualifiers from pointer target type util/trace-event-parse.c:706: warning: passing argument 2 of 'read_expected_item' discards qualifiers from pointer target type ... trigger because older GCC is not able to prove that sort_dimension__add() does not change the string. Some goes for test_type_token(). Fix this by improving type consistency. Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Acked-by: Frederic Weisbecker <fweisbec(a)gmail.com> Acked-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Cc: Paul Mackerras <paulus(a)samba.org> LKML-Reference: <20091005131729.78444bfb.randy.dunlap(a)oracle.com> [ Also remove ugly type cast now unnecessary. ] Signed-off-by: Ingo Molnar <mingo(a)elte.hu> diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index ea9c15c..ce2d5be 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1287,7 +1287,7 @@ static struct sort_dimension *available_sorts[] = { static LIST_HEAD(sort_list); -static int sort_dimension__add(char *tok, struct list_head *list) +static int sort_dimension__add(const char *tok, struct list_head *list) { int i; @@ -1917,7 +1917,7 @@ static void setup_sorting(void) free(str); - sort_dimension__add((char *)"pid", &cmp_pid); + sort_dimension__add("pid", &cmp_pid); } static const char *record_args[] = { diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 55b41b9..55c9659 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -618,7 +618,7 @@ static int test_type(enum event_type type, enum event_type expect) } static int test_type_token(enum event_type type, char *token, - enum event_type expect, char *expect_tok) + enum event_type expect, const char *expect_tok) { if (type != expect) { die("Error: expected type %d but read %d", @@ -650,7 +650,7 @@ static int read_expect_type(enum event_type expect, char **tok) return __read_expect_type(expect, tok, 1); } -static int __read_expected(enum event_type expect, char *str, int newline_ok) +static int __read_expected(enum event_type expect, const char *str, int newline_ok) { enum event_type type; char *token; @@ -668,12 +668,12 @@ static int __read_expected(enum event_type expect, char *str, int newline_ok) return 0; } -static int read_expected(enum event_type expect, char *str) +static int read_expected(enum event_type expect, const char *str) { return __read_expected(expect, str, 1); } -static int read_expected_item(enum event_type expect, char *str) +static int read_expected_item(enum event_type expect, const char *str) { return __read_expected(expect, str, 0); } -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 53f7e35f8b7fc2f5620a863ac613bcf3080cb6ba Author: jamal <hadi(a)cyberus.ca> Date: Sun Oct 11 04:21:38 2009 +0000 pkt_sched: pedit use proper struct This probably deserves to go into -stable. Pedit will reject a policy that is large because it uses the wrong structure in the policy validation. This fixes it. Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 96c0ed1..6b0359a 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -34,7 +34,7 @@ static struct tcf_hashinfo pedit_hash_info = { }; static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = { - [TCA_PEDIT_PARMS] = { .len = sizeof(struct tcf_pedit) }, + [TCA_PEDIT_PARMS] = { .len = sizeof(struct tc_pedit) }, }; static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est, -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit d1f6803a58e827fda7b810dcb7cbdb490d32ab9e Author: Eric Dumazet <eric.dumazet(a)gmail.com> Date: Sat Oct 10 21:40:54 2009 +0000 net: Add patchwork URL to MAINTAINERS Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/MAINTAINERS b/MAINTAINERS index 4c5b920..c34b728 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3630,6 +3630,7 @@ NETWORKING [GENERAL] M: "David S. Miller" <davem(a)davemloft.net> L: netdev(a)vger.kernel.org W: http://www.linuxfoundation.org/en/Net +W: http://patchwork.ozlabs.org/project/netdev/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git S: Maintained F: net/ -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit c01226c3145d173a0d38f9d5b4f229cc23d99ae2 Author: Arnd Bergmann <arnd(a)arndb.de> Date: Mon Sep 21 16:37:12 2009 +0200 warn about use of uninstalled kernel headers User applications frequently hit problems when they try to use the kernel headers directly, rather than the exported headers. This adds an explicit warning for this case, and points to a URL holding an explanation of why this is wrong and what to do about it. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d3cd23f..f4e3184 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -659,6 +659,12 @@ extern int do_sysinfo(struct sysinfo *info); #endif /* __KERNEL__ */ +#ifndef __EXPORTED_HEADERS__ +#ifndef __KERNEL__ +#warning Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders +#endif /* __KERNEL__ */ +#endif /* __EXPORTED_HEADERS__ */ + #define SI_LOAD_SHIFT 16 struct sysinfo { long uptime; /* Seconds since boot */ diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl index c6ae405..b89ca2c 100644 --- a/scripts/headers_install.pl +++ b/scripts/headers_install.pl @@ -20,7 +20,7 @@ use strict; my ($readdir, $installdir, $arch, @files) = @ARGV; -my $unifdef = "scripts/unifdef -U__KERNEL__"; +my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__"; foreach my $file (@files) { local *INFILE; -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 2331d1a6cd3d6e580bc88b9a160066d9e1177fe1 Author: Sam Ravnborg <sam(a)ravnborg.org> Date: Sun Oct 11 23:22:58 2009 +0200 kbuild: revert "save ARCH & CROSS_COMPILE ..." Revert commit 575543347b5baed0ca927cb90ba8807396fe9cc9 It caused following issues: - On architectures where ARCH= setting is used to select between 32 and 64 bit this was no longer possible without "make mrproper" - If ARCH was changed then kbuild refused to run "make mrproper" because ARCH had changed - When CROSS_COMPILE was changed people were asked to run "make mrproper" but kbuild refused to run "make mrproper" because CROSS_COMPILE changed. - Spaces in CROSS_COMPILE was not 'supported' - If an non-existing ARCH= was used kbuild could get stuck Lessons learned: . Despite being simple and straghtforward people uses very different approaches when building the kernel. . CROSS_COMPILE is sometimes used for ccache despite cache being only a CC frontend so one would have expected CC to be used for this purpose. . And obviously this was not tested widely enough. Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> Cc: Pavel Machek <pavel(a)ucw.cz> Cc: Ingo Molnar <mingo(a)elte.hu> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> diff --git a/Makefile b/Makefile index e50569a..8e5aaee 100644 --- a/Makefile +++ b/Makefile @@ -179,46 +179,9 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile -# -# To force ARCH and CROSS_COMPILE settings include kernel.* files -# in the kernel tree - do not patch this file. export KBUILD_BUILDHOST := $(SUBARCH) - -# Kbuild save the ARCH and CROSS_COMPILE setting in kernel.* files. -# Restore these settings and check that user did not specify -# conflicting values. - -saved_arch := $(shell cat include/generated/kernel.arch 2> /dev/null) -saved_cross := $(shell cat include/generated/kernel.cross 2> /dev/null) - -ifneq ($(CROSS_COMPILE),) - ifneq ($(saved_cross),) - ifneq ($(CROSS_COMPILE),$(saved_cross)) - $(error CROSS_COMPILE changed from \ - "$(saved_cross)" to \ - to "$(CROSS_COMPILE)". \ - Use "make mrproper" to fix it up) - endif - endif -else - CROSS_COMPILE := $(saved_cross) -endif - -ifneq ($(ARCH),) - ifneq ($(saved_arch),) - ifneq ($(saved_arch),$(ARCH)) - $(error ARCH changed from \ - "$(saved_arch)" to "$(ARCH)". \ - Use "make mrproper" to fix it up) - endif - endif -else - ifneq ($(saved_arch),) - ARCH := $(saved_arch) - else - ARCH := $(SUBARCH) - endif -endif +ARCH ?= $(SUBARCH) +CROSS_COMPILE ?= # Architecture as present in compile.h UTS_MACHINE := $(ARCH) @@ -483,11 +446,6 @@ ifeq ($(config-targets),1) include $(srctree)/arch/$(SRCARCH)/Makefile export KBUILD_DEFCONFIG KBUILD_KCONFIG -# save ARCH & CROSS_COMPILE settings -$(shell mkdir -p include/generated && \ - echo $(ARCH) > include/generated/kernel.arch && \ - echo $(CROSS_COMPILE) > include/generated/kernel.cross) - config: scripts_basic outputmakefile FORCE $(Q)mkdir -p include/linux include/config $(Q)$(MAKE) $(build)=scripts/kconfig $@ -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit d93a8f829fe1d2f3002f2c6ddb553d12db420412 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sun Oct 11 15:57:57 2009 -0700 Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier" This reverts commit db8be50c4307dac2b37305fc59c8dc0f978d09ea, as per http://bugzilla.kernel.org/show_bug.cgi?id=14374 http://marc.info/?l=linux-kernel&m=125446885705223&w=4 We simply can't do the USB handoff at FIXUP_HEADER time, since it will often require us to have valid IO mappings etc. But that in turn requires a whole different approach, not this trivial one-liner. Maybe we could teach all the USB quirk handoff handlers to only do the quirk if the device has all its registers set up (since if it isn't initialized, it's unlikely to be active), but regardless that will need a whole lot more code than just saying "let's do it really early". The proper fix is almost certainly to just leave the legacy IOMMU mappings active until after all devices have been initialized. Reported-by: Nick Piggin <npiggin(a)suse.de> Cc: David Woodhouse <David.Woodhouse(a)intel.com> Cc: Greg Kroah-Hartman <gregkh(a)suse.de> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 23cf3bd..83b5f9c 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -475,4 +475,4 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev) else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI) quirk_usb_handoff_xhci(pdev); } -DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); +DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 9c3049c02c6142e166c9472237f1f60d86153682 Author: Felipe Contreras <felipe.contreras(a)gmail.com> Date: Thu Sep 17 00:38:39 2009 +0300 kbuild: fix warning when domainname is not available Otherwise we get: "dnsdomainname: Unknown host" Signed-off-by: Felipe Contreras <felipe.contreras(a)gmail.com> Acked-by: WANG Cong <xiyou.wangcong(a)gmail.com> Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 6a12dd9..f060763 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -66,9 +66,13 @@ UTS_TRUNCATE="sed -e s/$.\{1,$UTS_LEN\}$.*/\1/" echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" if [ -x /bin/dnsdomainname ]; then - echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\" + domain=`dnsdomainname 2> /dev/null` elif [ -x /bin/domainname ]; then - echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\" + domain=`domainname 2> /dev/null` + fi + + if [ -n "$domain" ]; then + echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\" else echo \#define LINUX_COMPILE_DOMAIN fi -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 17c5ca98833dc3d8f8dd4e85487da238c50cd8c9 Author: Felipe Contreras <felipe.contreras(a)gmail.com> Date: Thu Sep 17 00:38:40 2009 +0300 kbuild: mkcompile_h: trivial cleanups UTS_TRUNCATTE is simpler this way, and now editors idetify this as a shell script. Signed-off-by: Felipe Contreras <felipe.contreras(a)gmail.com> Acked-by: WANG Cong <xiyou.wangcong(a)gmail.com> Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index f060763..bce3d0f 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -1,3 +1,5 @@ +#!/bin/sh + TARGET=$1 ARCH=$2 SMP=$3 @@ -50,7 +52,7 @@ UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP" # Truncate to maximum length UTS_LEN=64 -UTS_TRUNCATE="sed -e s/$.\{1,$UTS_LEN\}$.*/\1/" +UTS_TRUNCATE="cut -b -$UTS_LEN" # Generate a temporary compile.h -- batman-adv

1 0

← Newer
1
...
83
84
85
86
87
88
89
...
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009