06 Aug, 2008
9 commits
-
This re-introduces commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8,
which was reverted due to the regression it caused by commit
fca082c9f1e11ec07efa8d2f9f13688521253f36.That regression was not root-caused by the original commit, it was just
uncovered by it, and the real fix was done by Alan Stern in commit
580da34847488b404218d1d7f53b156f245f5555 ("Fix USB storage hang on
command abort").We can thus re-introduce the change that was confirmed by Alan Jenkins
to be still required by his odd card reader.Cc: Alan Jenkins
Cc: Alan Stern
Cc: James Bottomley
Signed-off-by: Linus Torvalds -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits)
AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
pktgen: mac count
pktgen: random flow
bridge: Eliminate unnecessary forward delay
bridge: fix compile warning in net/bridge/br_netfilter.c
ipv4: remove unused field in struct flowi (include/net/flow.h).
tg3: Fix 'scheduling while atomic' errors
net: Kill plain NET_XMIT_BYPASS.
net_sched: Add qdisc __NET_XMIT_BYPASS flag
net_sched: Add qdisc __NET_XMIT_STOLEN flag
iwl3945: fix merge mistake for packet injection
iwlwifi: grap nic access before accessing periphery registers
iwlwifi: decrement rx skb counter in scan abort handler
iwlwifi: fix unhandled interrupt when HW rfkill is on
iwlwifi: implement iwl5000_calc_rssi
iwlwifi: memory allocation optimization
iwlwifi: HW bug fixes
p54: Fix potential concurrent access to private data
rt2x00: Disable link tuning in rt2500usb
iwlwifi: Don't use buffer allocated on the stack for led names
... -
A documentation cleanup patch. With a minor tweak to clarify units for
kbs.[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: mark gross
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
hangs in my sparc64 boxes when the init scripts set the font. The problem
goes away if I disable acceleration.I haven't figured out that bug yet, but along the way I found some
corrections to make based upon some auditing.1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
and the XORG video driver differ. I've made the kernel
match what XORG is using.2) In radeonfb_engine_reset() we have top-level code structure
that roughly looks like:if (family is 300, 350, or V350)
do this;
else
do that;
...
if (family is NOT 300, OR
family is NOT 350, OR
family is NOT V350)
do another thing;this last conditional makes no sense, is always true,
and obviously was likely meant to be "family is NOT
300, 350, or V350". So I've made the code match the
intent.Signed-off-by: David S. Miller
Acked-by: Benjamin Herrenschmidt
Tested-by: Benjamin Herrenschmidt
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
These functions have been deprecated for some time now but remained until
all legacy callers could be removed. With a few commits in 2.6.26 this
has happened so now we can remove these deprecated functions.Signed-off-by: Mark Asselstine
Reviewed-by: Matthew Wilcox
Cc: Alan Cox
Cc: Ingo Molnar
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This adds an SPI driver for the SPI controller found in various Marvell
Orion ARM SoCs. It currently supports only one slave, which must use SPI
mode 0.[dbrownell@users.sourceforge.net: cleanups, meet specs, pass "sparse"]
Signed-off-by: Shadi Ammouri
Signed-off-by: Saeed Bishara
Signed-off-by: Lennert Buytenhek
Signed-off-by: David Brownell
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The current implementation reports the structure name as
VMCOREINFO_OSRELEASE in VMCOREINFO, e.g.VMCOREINFO_OSRELEASE=init_uts_ns.name.release
That doesn't make sense because it's always the same. Instead, use the
value, e.g.VMCOREINFO_OSRELEASE=2.6.26-rc3
That's also what the 'makedumpfile -g' does.
Signed-off-by: Bernhard Walle
Cc: "Ken'ichi Ohmichi"
Acked-by: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The benefits of a user settable CONFIG_IDE_MAX_HWIFS have become pretty
tiny and are no longer considered worth the trouble of an own option.Simply always #define MAX_HWIFS to 10.
Signed-off-by: Adrian Bunk
Signed-off-by: Bartlomiej Zolnierkiewicz -
v2:
Add missing '@'-s. (Noticed by Randy Dunlap)Cc: Randy Dunlap
Signed-off-by: Bartlomiej Zolnierkiewicz
05 Aug, 2008
18 commits
-
This patch removes an unused field (flags) from struct flowi; it seems
that this "flags" field was used once in the past for multipath
routing with FLOWI_FLAG_MULTIPATHOLDROUTE flag (which does no longer
exist); however, the "flags" field of struct flowi is not used
anymore.Signed-off-by: Rami Rosen
Signed-off-by: David S. Miller -
dst_input() was doing something completely absurd, looping
on skb->dst->input() if NET_XMIT_BYPASS was seen, but these
functions never return such an error.And as a result plain ole' NET_XMIT_BYPASS has no more
references and can be completely killed off.Signed-off-by: David S. Miller
-
Patrick McHardy noticed that it would be nice to
handle NET_XMIT_BYPASS by NET_XMIT_SUCCESS with an internal qdisc flag
__NET_XMIT_BYPASS and to remove the mapping from dev_queue_xmit().David Miller spotted a serious bug in the first
version of this patch.Signed-off-by: Jarek Poplawski
Signed-off-by: David S. Miller -
Patrick McHardy noticed:
"The other problem that affects all qdiscs supporting actions is
TC_ACT_QUEUED/TC_ACT_STOLEN getting mapped to NET_XMIT_SUCCESS
even though the packet is not queued, corrupting upper qdiscs'
qlen counters."and later explained:
"The reason why it translates it at all seems to be to not increase
the drops counter. Within a single qdisc this could be avoided by
other means easily, upper qdiscs would still increase the counter
when we return anything besides NET_XMIT_SUCCESS though.This means we need a new NET_XMIT return value to indicate this to
the upper qdiscs. So I'd suggest to introduce NET_XMIT_STOLEN,
return that to upper qdiscs and translate it to NET_XMIT_SUCCESS
in dev_queue_xmit, similar to NET_XMIT_BYPASS."David Miller noticed:
"Maybe these NET_XMIT_* values being passed around should be a set of
bits. They could be composed of base meanings, combined with specific
attributes.So you could say "NET_XMIT_DROP | __NET_XMIT_NO_DROP_COUNT"
The attributes get masked out by the top-level ->enqueue() caller,
such that the base meanings are the only thing that make their
way up into the stack. If it's only about communication within the
qdisc tree, let's simply code it that way."This patch is trying to realize these ideas.
Signed-off-by: Jarek Poplawski
Signed-off-by: David S. Miller -
Like the page lock change, this also requires name change, so convert the
raw test_and_set bitop to a trylock.Signed-off-by: Nick Piggin
Signed-off-by: Linus Torvalds -
Converting page lock to new locking bitops requires a change of page flag
operation naming, so we might as well convert it to something nicer
(!TestSetPageLocked_Lock => trylock_page, SetPageLocked => set_page_locked).This also facilitates lockdeping of page lock.
Signed-off-by: Nick Piggin
Acked-by: KOSAKI Motohiro
Acked-by: Peter Zijlstra
Acked-by: Andrew Morton
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Linus Torvalds -
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
sh: enable maple_keyb in dreamcast_defconfig.
SH2(A) cache update
nommu: Provide vmalloc_exec().
add addrespace definition for sh2a.
sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support.
sh: define GENERIC_HARDIRQS_NO__DO_IRQ.
sh: define GENERIC_LOCKBREAK.
sh: Save NUMA node data in vmcore for crash dumps.
sh: module_alloc() should be using vmalloc_exec().
sh: Fix up __bug_table handling in module loader.
sh: Add documentation and integrate into docbook build.
sh: Fix up broken kerneldoc comments.
maple: Kill useless private_data pointer.
maple: Clean up maple_driver_register/unregister routines.
input: Clean up maple keyboard driver
maple: allow removal and reinsertion of keyboard driver module
sh: /proc/asids depends on MMU.
arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include
arch/sh/boards/board-ap325rxa.c: removed duplicated #include
sh/boards/Makefile typo fix
... -
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Remove use of CONFIG_PPC_MERGE
powerpc: Force printing of 'total_memory' to unsigned long long
powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
powerpc: Move include files to arch/powerpc/include/asm -
My last change to tracehook.h made it confuse the kerneldoc parser.
Move the #define's before the comment so it's happy again.Signed-off-by: Roland McGrath
Acked-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
So copy their contents into the asm-m68k files.
Signed-off-by: Stephen Rothwell
Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] move include/asm-s390 to arch/s390/include/asm -
* git://git.infradead.org/users/dwmw2/random-2.6:
drivers/video/console/promcon.c: fix build error
Fix IHEX firmware generation/loading -
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Add DIP switch readout for HFC-4S IOB4ST
Fix remaining big endian issue of hfcmulti
mISDN cleanup user interface
mISDN fix main ISDN Makefile -
This reverts commit f9247273cb69ba101877e946d2d83044409cc8c5 (and
fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 - "fix fs/nfs/nfsroot.c
compilation" - that fixed a missed conversion).The changes cause problems for at least the sparc build. Let's re-do
them when the exact issues are resolved.Requested-by: Andrew Morton
Requested-by: Steven Whitehouse
Cc: David Miller
Signed-off-by: Linus Torvalds -
This reverts commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8, since it
seems to break some other USB storage devices (at least a JMicron USB to
ATA bridge). As such, while it apparently fixes some cardreaders, it
would need to be made conditional on the exact reader it fixes in order
to avoid causing regressions.Cc: Alan Jenkins
Cc: James Bottomley
Signed-off-by: Linus Torvalds -
This patch makes possible for a driver to specify maximal listen interval
The possibility for user to configure listen interval is not implemented
yet, currently the maximum provided by the driver or 1 is used.
Mac80211 uses config handler to set listen interval for to the driver.Signed-off-by: Tomas Winkler
Signed-off-by: Emmanuel Grumbach
Signed-off-by: Zhu Yi
Signed-off-by: John W. Linville -
This patch adds the dtim_period in ieee80211_bss_conf, this allows the low
level driver to know the dtim_period, and to plan power save accordingly.Signed-off-by: Emmanuel Grumbach
Signed-off-by: Tomas Winkler
Signed-off-by: Zhu Yi
Acked-by: Johannes Berg
Signed-off-by: John W. Linville
04 Aug, 2008
5 commits
-
The ipfragok flag controls whether the packet may be fragmented
either on the local host on beyond. The latter is only valid on
IPv4.In fact, we never want to do the latter even on IPv4 when PMTU is
enabled. This is because even though we can't fragment packets
within SCTP due to the prtocol's inherent faults, we can still
fragment it at IP layer. By setting the DF bit we will improve
the PMTU process.RFC 2960 only says that we SHOULD clear the DF bit in this case,
so we're compliant even if we set the DF bit. In fact RFC 4960
no longer has this statement.Once we make this change, we only need to control the local
fragmentation. There is already a bit in the skb which controls
that, local_df. So this patch sets that instead of using the
ipfragok argument.The only complication is that there isn't a struct sock object
per transport, so for IPv4 we have to resort to changing the
pmtudisc field for every packet. This should be safe though
as the protocol is single-threaded.Note that after this patch we can remove ipfragok from the rest
of the stack too.Signed-off-by: Herbert Xu
Signed-off-by: David S. Miller -
from include/asm-powerpc. This is the result of a
mkdir arch/powerpc/include/asm
git mv include/asm-powerpc/* arch/powerpc/include/asmFollowed by a few documentation/comment fixups and a couple of places
where was being used explicitly. Of the latter only
one was outside the arch code and it is a driver only built for powerpc.Signed-off-by: Stephen Rothwell
Signed-off-by: Paul Mackerras -
We can simply wrap in to the dev_set/get_drvdata(), there's no reason
to track an extra level of private data on top of the struct device.Signed-off-by: Paul Mundt
-
These were completely inconsistent. Clean these up to take a maple_driver
pointer directly for consistency.Signed-off-by: Paul Mundt
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5182/1: pxa: Fix pcm990 compilation
[ARM] Fix explicit asm(-arm)?/arch-foo references
[ARM] move include/asm-arm to arch/arm/include/asm
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
[ARM] initrd: claim initrd memory exclusively
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
[ARM] i.MX: add missing clock functions exports
[ARM] i.MX: remove set_imx_fb_info() export
[ARM] mx1ads: make mmc platform data available for modules
[ARM] mx2: add missing Kconfig dependency
03 Aug, 2008
5 commits
-
drivers/video/console/promcon.c:158: error: implicit declaration of
function 'con_protect_unimap'Introduced by commit a29ccf6f823a84d89e1c7aaaf221cf7282022024
("embedded: fix vc_translate operator precedence").Signed-off-by: Alexander Beregalov
Cc: Tim Bird
Signed-off-by: David Woodhouse -
It is the only legal environment in which this can be
used.Add some commentary explaining the situation.
Signed-off-by: David S. Miller
-
No file should be explicitly referencing its own platform headers
by specifying an absolute include path. Fix these paths to use
standard includes.Signed-off-by: Russell King
-
Move platform independent header files to arch/arm/include/asm, leaving
those in asm/arch* and asm/plat* alone.Signed-off-by: Russell King
-
Fix both the IHEX firmware generation (len field always null, and EOF
marker a byte too short) and loading (struct ihex_binrec needs to be
packed to reflect the on-disk structure).Signed-off-by: Marc Zyngier
Signed-off-by: David Woodhouse
02 Aug, 2008
3 commits
-
The channelmap should have the same size on 32 and 64 bit systems
and should not depend on endianess.
Thanks to David Woodhouse for spotting this.Signed-off-by: Karsten Keil
-
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm -
This fixes a bug in operator precedence in the newly introduced vc_translate
macro. Without this fix, the translation of some characters on the
kernel console is garbled.This patch was copied to the e-mail list previously for testing. Now,
all reports confirm that it works, so this is an official post for
application.Signed-off-by: Tim Bird
Signed-off-by: David Woodhouse
