summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2005-07-25[SPARC]: sbus/aurora: replace schedule_timeout() with msleep_interruptible()Nishanth Aravamudan1-4/+2
Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org>
2005-07-25[SPARC]: Remvoe APM_RTC_IS_GMT from config.Adrian Bunk1-14/+0
I can't see any effect of this option outside the i386-specific APM code. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-24Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds8-110/+70
2005-07-24Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds10-35/+59
2005-07-24[PATCH] ARM: 2825/1: S3C2410: turns %d into %ld on DMA printkLucas Correia Villa Real1-1/+1
Patch from Lucas Correia Villa Real This patch replaces the sizeof()'s %d specifier by %ld on a S3C2410 DMA printk. Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-07-23/home/lenb/linux-2.6 branch 'acpi-2.6.12'Luming Yu1-14/+3
2005-07-23ACPI: delete unnecessary EC console messagesLuming Yu1-14/+3
http://bugzilla.kernel.org/show_bug.cgi?id=4534 Signed-off-by: Luming Yu <luming.yu@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
2005-07-23Remove "noreplacement" kernel command line option.Linus Torvalds1-13/+1
It is no longer valid to not replace instructions, since we depend on different behaviour depending on CPU capabilities. If you need to limit the capabilities of the replacements (because the boot CPU has features that non-boot CPU's do not have, for example), you need to explicitly disable those capabilities that are not shared across all CPU's. For example, if your boot CPU has FXSR, but other CPU's in your system do not, you need to use the "nofxsr" kernel command line, not disable instruction replacement per se.
2005-07-23x86: use alternative instructions for fnsave/fxsave tooLinus Torvalds1-8/+7
This one ends up using an inline asm format that claims to read memory and then clobber it (rather than just write it directly), which made it easier to use the existing "alternative_input()" infrastructure support. Now the fxsave code matches the fxrstor.
2005-07-23Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds58-685/+687
2005-07-23[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}David S. Miller2-28/+3
More unusable TCF_META_* match types that need to get eliminated before 2.6.13 goes out the door. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Thomas Graf <tgraf@suug.ch>
2005-07-23x86: make restore_fpu() use alternative assembler instructionsLinus Torvalds2-12/+12
It's really just a single instruction, conditional on whether the CPU supports FXSR or not, so implement it as such instead of making it a function that queries FXSR dynamically. This means that the instruction just gets automatically rewritten to the correct one at boot-time.
2005-07-22[NETFILTER]: Fix ip6t_LOG MAC formatPatrick McHardy1-4/+7
I broke this in the patch that consolidated MAC logging. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-22[NETFILTER]: Use correct byteorder in ICMP NATPatrick McHardy1-3/+4
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-22[NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped ↵Patrick McHardy1-0/+3
on unload Fixes a crash when unloading ip_conntrack. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-22[NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)Patrick McHardy2-2/+4
The portptr pointing to the port in the conntrack tuple is declared static, which could result in memory corruption when two packets of the same protocol are NATed at the same time and one conntrack goes away. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-22[NETFILTER]: Fix deadlock in ip6_queuePatrick McHardy1-0/+2
Already fixed in ip_queue, ip6_queue was missed. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-22Fix up incorrect "unlikely()" on %gs reload in x86 __switch_toLinus Torvalds1-8/+12
These days %gs is normally the TLS segment, so it's no longer zero. As a result, we shouldn't just assume that %fs/%gs tend to be zero together, but test them independently instead. Also, fix setting of debug registers to use the "next" pointer instead of "current". It so happens that the scheduler will have set the new current pointer before calling __switch_to(), but that's just an implementation detail.
2005-07-22[PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.David S. Miller2-13/+0
It won't exist any longer when we shrink the SKB in 2.6.14, and we should kill this off before anyone in userspace starts using it. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Thomas Graf <tgraf@suug.ch>
2005-07-22[PATCH] Serial: No need to check for priv != NULL in remove_oneRussell King1-20/+17
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-07-22[EQL]: Proper num_slaves decrementLoic Le Loarer1-8/+8
Signed-off-by: Loic Le Loarer <loic.le-loarer+lk@polytechnique.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-22[NETFILTER]: ip_conntrack_expect_related must not free expectationRusty Russell12-60/+46
If a connection tracking helper tells us to expect a connection, and we're already expecting that connection, we simply free the one they gave us and return success. The problem is that NAT helpers (eg. FTP) have to allocate the expectation first (to see what port is available) then rewrite the packet. If that rewrite fails, they try to remove the expectation, but it was freed in ip_conntrack_expect_related. This is one example of a larger problem: having registered the expectation, the pointer is no longer ours to use. Reference counting is needed for ctnetlink anyway, so introduce it now. To have a single "put" path, we need to grab the reference to the connection on creation, rather than open-coding it in the caller. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-21[PATCH] ARM SMP: Mark mroe CPU init data with __cpuinitdataRussell King1-2/+2
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-07-20[ATM]: zatm: mailbox converted to pci_alloc_consistent()Francois Romieu2-46/+62
mailbox converted to pci_alloc_consistent() - request_region() is not needed: zatm_init_one() issues pci_request_regions(); - the warning related to kfree(zatm_dev->mbx_start) disappears; Compiled with i386 and sparc64 as target. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[NET]: Fix tc_verd thinko in skb_clone()David S. Miller1-2/+2
It was overwriting the computer n->tc_verd value over and over with skb->tc_verd, by mistake. Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[NET]: Make ipip/ip6_tunnel independant of XFRMPatrick McHardy6-14/+67
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[IPV4]: Fix up lots of little whitespace indentation stuff in fib_trie.Stephen Hemminger2-386/+388
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[NET]: NETCONSOLE must depend on INETAdrian Bunk1-1/+1
NETCONSOLE=y and INET=n results in the following compile error: net/built-in.o: In function `netpoll_parse_options': : undefined reference to `in_aton' net/built-in.o: In function `netpoll_parse_options': : undefined reference to `in_aton' Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[NET]: BRIDGE_EBT_ARPREPLY must depend on INETAdrian Bunk1-1/+1
BRIDGE_EBT_ARPREPLY=y and INET=n results in the following compile error: net/built-in.o: In function `ebt_target_reply': ebt_arpreply.c:(.text+0x68fb9): undefined reference to `arp_send' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[IPV4]: Don't select XFRM for ip_grePatrick McHardy1-1/+0
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[NET]: Only build flow.o if CONFIG_XFRM=yPatrick McHardy1-1/+2
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: [speedtch] cure atm_printk() macro gcc-2.95 compile errorDuncan Sands1-6/+6
Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: Trivial spelling fix patch for net/KconfigJesper Juhl1-2/+2
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: [ambassador] Fix the sparse warning "implicit cast to nocast type"Victor Fusco1-1/+3
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: [firestream] fix the sparse warning "implicit cast to nocast type"Victor Fusco1-2/+4
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: [he] remove linux/version.h includeOlaf Hering1-1/+0
Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: [idt77252] use time_after() macroMarcelo Feitoza Parisi1-1/+2
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: allow bind() on point-to-multpoint svcs (from Martin Whitaker ↵Chas Williams1-4/+0
<martin_whitaker@ntlworld.com>) Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-20[ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>)Chas Williams1-1/+1
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[EMATCH]: Kill TCF_META_ID_TCCLASSID reference from meta ematch as well.David S. Miller1-6/+0
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[IPV4]: fix IP_FIB_HASH kconfig warningAdrian Bunk1-7/+3
This patch fixes the following kconfig warning: net/ipv4/Kconfig:92:warning: defaults for choice values not supported Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[NET]: Kconfig: NETCONSOLE and NETPOLL togetherRandy Dunlap2-16/+16
Put NETCONSOLE and NETPOLL options together since they are related. This cuts down on the hassle of flipping back and forth between the Networking menu and the Network drivers menu to change their config settings. Tested with menuconfig, gconfig, and xconfig. gconfig has a small problem with this. I think that it's a bug in gconfig and I will take it up with Romain Lievin. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[SCTP]: Fix potential null pointer dereference while handling an icmp errorSridhar Samudrala3-42/+17
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[SCTP]: Audit return code of create_proc_*Christophe Lucas1-1/+5
From: Christophe Lucas <clucas@rotomalug.org> Audit return of create_proc_* functions. Signed-off-by: Christophe Lucas <clucas@rotomalug.org> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[NET]: Fix "nocast type" warnings in skbuff.hVictor Fusco1-1/+2
From: Victor Fusco <victor@cetuc.puc-rio.br> Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[NETLINK]: Fix "nocast type" warningsVictor Fusco1-2/+3
From: Victor Fusco <victor@cetuc.puc-rio.br> Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[PKT_SCHED]: Kill TCF_META_ID_TCCLASSID.Patrick McHardy1-1/+0
Thomas Graf states: > I used to mark such ids as obsolete in the header but since > skb is on diet anyway and there has been no official > iproute2 release with the ematch bits included it might be > a better idea to remove the ids from the header completely. > Those that have picked up my patch on netdev shouldn't care > about a ABI breakage, actually I doubt that someone is using > it already. So here's the patch to remove it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[PKT_SCHED]: Reduce branch mispredictions in pfifo_fast_dequeueThomas Graf1-4/+3
The current call to __qdisc_dequeue_head leads to a branch misprediction for every loop iteration, the fact that the most common priority is 2 makes this even worse. This issue has been brought up by Eric Dumazet <dada1@cosmosbay.com> but unlike his solution which was to manually unroll the loop, this approach preserves the possibility to increase the number of bands at compile time. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-19[PKT_SCHED]: Remove debugging leftover from textsearch ematchThomas Graf1-3/+0
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-18[PATCH] Serial: Add support for SIIG Quartet serial cardAndrey Panin2-0/+16
Add support for SIIG Quartet Serial card. This card has Oxford Semiconducor 16954 quad UART which is clocked by 10x faster (18.432 MHz) quartz. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.0) at 2025-03-13 06:10:49 +0300