This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, for-linus has been updated
3c92ec8 Merge branch 'next' of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
c4c9f01 net: ehea NAPI interface cleanup fix
bf66542 cifs: update for new IP4/6 address printing
d05a788 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
96faec9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
2926328 Merge
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram
54d2f64 Merge branch 'next' into for-linus
ca9153a powerpc/44x: Support 16K/64K base page sizes on 44x
6ca4f74 powerpc: Force memory size to be a multiple of PAGE_SIZE
541ef5c Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
0191b62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
54a696b Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
1d248b2 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
1db2a5c Merge branch 'for-linus' of
git://git390.osdl.marist.edu/pub/scm/linux-2.6
a39b863 Merge branch 'sched-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
b0f4b28 Merge branch 'tracing-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
be9c5ae Merge branch 'x86-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
bb26c6c Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
e14e61e Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
cb10ea5 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
81d6e59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
aa6eeee m68k: use the new byteorder headers
7f877eb fbcon: Protect free_irq() by MACH_IS_ATARI check
79f0c9a fbcon: remove broken mac vbl handler
646819e m68k: fix trigraph ignored warning in setox.S
3839d01 macfb annotations and compiler warning fix
746e8d3 m68k: mac baboon interrupt enable/disable
429dbf5 m68k: machw.h cleanup
4a97359 m68k: Mac via cleanup and commentry
40f7f9c m68k: Reinstate mac rtc
eb56092 net: Allow dependancies of FDDI & Tokenring to be modular.
8d25332 igb: Fix build warning when DCA is disabled.
2d5451d net: Fix warning fallout from recent NAPI interface changes.
0da2afd gro: Fix potential use after free
8438134 sfc: If AN is enabled, always read speed/duplex from the AN
advertising bits
f4bd954 sfc: When disabling the NIC, close the device rather than
unregistering it
307505e sfc: SFT9001: Add cable diagnostics
1796721 sfc: Add support for multiple PHY self-tests
2ef3068 sfc: Merge top-level functions for self-tests
a5692e4 sfc: Clean up PHY mode management in loopback self-test
caa8d8b sfc: Fix unreliable link detection in some loopback modes
6977dc6 sfc: Generate unique names for per-NIC workqueues
e727149 802.3ad: use standard ethhdr instead of ad_header
e4ac432 802.3ad: generalize out mac address initializer
7addeef 802.3ad: initialize ports LACPDU from const initializer
87f422f 802.3ad: remove typedef around ad_system
1624db7 802.3ad: turn ports is_individual into a bool
f48127b 802.3ad: turn ports is_enabled into a bool
d238d45 802.3ad: make ntt bool
d3fa472 ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
7adf152 ixgbe: Fix NAPI enable/disable path when using DCB
d7b0663 net: Init NAPI dev_list on napi_del
26bc19e igb: re-order queues to support cleaner use of ivar on 82576
0e014cb igb: defeature tx head writeback
f2712fd ipsec: Remove useless ret variable
fdb614c ucc_geth: Eliminate the need for forward references
9c54004 atm: Driver for Solos PCI ADSL2+ card.
236b87c gigaset: ifdef cleanup
c8770dc gigaset: use pr_err() and pr_info()
4d8cd00 cxgb3: add control to access embedded images
6dd0148 drivers/net/wireless/prism54: fix sparse warnings: make symbols static
a3d1fd2 drivers/net/wireless/ipw2x00: fix sparse warnings: make symbols static
11ab72a drivers/net/wireless/b43: fix sparse warnings: make symbols static
bf512bc drivers/net/wireless/ath9k: fix sparse warnings: make symbols static
2ed5ba8 drivers/net/wireless: fix sparse warnings: make symbols static
62c5345 drivers/net/wan/z85230.c: fix sparse warnings: un-EXPORT symbols
7b3dfa1 drivers/net/wan: fix sparse warning: make symbol static
d157e02 drivers/net/wan: fix sparse warnings: make do-while a compound
statement
ec1d1eb drivers/net/tulip: fix sparse warnings: make do-while a compound
statement
27cd6ae drivers/net/tokenring: fix sparse warnings: make symbols static
409b204 drivers/net/skfp: fix sparse warnings: make symbols static
2f22d22 drivers/net/qlge: fix sparse warnings: make symbols static
f8057b7 drivers/net/netxen: fix sparse warnings: use NULL pointer instead of
plain integer
e855aac drivers/net/ixgbe: fix sparse warnings: make symbols static
0e49e64 drivers/net/irda: fix sparse warnings: make symbols static
678c610 drivers/net/igb: remove dead code (function 'igb_read_pci_cfg')
5e4232e drivers/net/enic: fix sparse warning: make symbol static
fa4c16d drivers/net/e1000e: fix sparse warnings: make symbols static
af8eca5 drivers/net/cxgb3: comment out dead code
b06715b drivers/net/bonding: fix sparse warnings: move decls to header file
9dc20f5 drivers/net/atlx: fix sparse warnings: make symbols static
888432f drivers/net/arcnet: fix sparse warnings: make symbols static
dac499f drivers/net: fix sparse warnings: make symbols static
a08b32d drivers/net: fix sparse warning: returning void-valued expression
e4c3c13 drivers/net: fix sparse warnings: make do-while a compound statement
2705d4f drivers/net: fix sparse warning: use ANSI-style function declaration
d76e56b ehea: use get_zeroed_page for alignment-sensitive allocation
359d67d [CIFS] Remove redundant test
c6fbba0 [CIFS] make sure that DFS pathnames are properly formed
ac6a3ef Remove an already-checked error condition in SendReceiveBlockingLock
698e96a Streamline SendReceiveBlockingLock: Use "goto out:" in an error
condition
17c8bfe Streamline SendReceiveBlockingLock: Use "goto out:" in an error
condition
2b2bdfb [CIFS] Streamline SendReceive[2] by using "goto out:" in an error
condition
8e4f2e8 Slightly streamline SendReceive[2]
829049c Check the return value of cifs_sign_smb[2]
4c3130e [CIFS] Cleanup: Move the check for too large R/W requests
27a97a6 [CIFS] Slightly simplify wait_for_free_request(), remove an
unnecessary "else" branch
8fbbd36 Simplify allocate_mid() slightly: Remove some unnecessary "else"
branches
6d9c6d5 [CIFS] In SendReceive, move consistency check out of the mutexed
region
00e485b cifs: store password in tcon
4e53a3f cifs: have calc_lanman_hash take more granular args
55162de cifs: zero out session password before freeing it
8570552 cifs: fix wait_for_response to time out sleeping processes correctly
8be0ed4 [CIFS] Can not mount with prefixpath if root directory of share is
inaccessible
61e7480 [CIFS] various minor cleanups pointed out by checkpatch script
3de2091 [CIFS] fix typo
acc18aa [CIFS] remove sparse warning
13a6e42 [CIFS] add mount option to send mandatory rather than advisory locks
d5c5605 cifs: make ipv6_connect take a TCP_Server_Info arg
bcf4b10 cifs: make ipv4_connect take a TCP_Server_Info arg
7586b76 cifs: don't declare smb_vol info on the stack
63c038c cifs: move allocation of new TCP_Server_Info into separate function
8ecaf67 cifs: account for IPv6 in ses->serverName and clean up netbios name
handling
954d7a1 cifs: make dnotify thread experimental code
72ca545 cifs: convert tcpSem to a mutex
0468a2c cifs: take module reference when starting cifsd
8090902 cifs: display addr and prefixpath options in /proc/mounts
24b9b06 cifs: remove unused SMB session pointer from struct mid_q_entry
26c743b mlx4_en: Remove pauses module parameters.
60b9f9e mlx4_en: Removed Interrupt moderation module parameters
c03ea21 mlx4_en: Removed redundant cq->armed flag
48374dd mlx4_en: Removed TX locking when polling TX cq
b51968d mlx4_en: Memory leak on completion queue free
e74b3f7 Merge branch 'for-david' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
13e620e myri10ge: update driver version to 1.4.4-1.395
e92df28 myri10ge: update firmware headers to 1.4.37
36994a0 forcedeth: don't poll NV event 36
88a44e5 net/appletalk: Remove redundant test
c14ea0c drivers/net/wan: Remove redundant test
90f5dfc drivers/net: Remove redundant test
662f44a drivers/net/ehea: Remove redundant test
b0fd0d2 drivers/net/au1000_eth.c: Remove redundant test
c062076 qlge: ql_adapter_down() typo
619e803 netlink: fix (theoretical) overrun in message iteration
64ff3b9 tcp: Always set urgent pointer if it's beyond snd_nxt
8510b93 sctp: Add validity check for SCTP_PARTIAL_DELIVERY_POINT socket option
9fcb95a sctp: Avoid memory overflow while FWD-TSN chunk is received with bad
stream ID
aea3c5c sctp: Implement socket option SCTP_GET_ASSOC_NUMBER
ea686a2 sctp: Fix a typo in socket.c
e89c209 sctp: Bring SCTP_MAXSEG socket option into ietf API extension
compliance
161c8d2 net: PHYLIB mdio fixes #2
f7d1b9f vlan: fix convertion to net_device_ops
d452273 smsc911x: fix platform resource call during module unload
dc26977 smsc911x: don't clobber driver_data
7091e72 netns: igmp: make /proc/net/{igmp,mcfilter} per netns
b4ee07d netns: igmp: allow IPPROTO_IGMP sockets in netns
cb5b04f smsc911x: make smsc911x_ethtool_ops constant
631b756 smsc911x: convert driver to use net_device_ops
dd04519 smsc911x: fix BUG if module is removed while interface is up
4e20228 Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core
cef7125 [S390] provide documentation for hvc_iucv kernel parameter.
2a7c6f2 [S390] convert ctcm printks to dev_xxx and pr_xxx macros.
ecf39d4 [S390] convert zfcp printks to pr_xxx macros.
5466c2e [S390] convert vmlogrdr printks to pr_xxx macros.
17159dc6 [S390] convert zfcp dumper printks to pr_xxx macros.
395d31d [S390] convert cpu related printks to pr_xxx macros.
74eacdb [S390] convert qeth printks to dev_xxx and pr_xxx macros.
b3ff088 [S390] convert sclp printks to pr_xxx macros.
8f7c502 [S390] convert iucv printks to dev_xxx and pr_xxx macros.
136f7a1 [S390] convert ap_bus printks to pr_xxx macros.
93098bf [S390] convert dcssblk and extmem printks messages to pr_xxx macros.
1519c0c [S390] convert monwriter printks to pr_xxx macros.
c5612c1 [S390] convert s390 debug feature printks to pr_xxx macros.
a4f5a29 [S390] convert monreader printks to pr_xxx macros.
e7534b0 [S390] convert appldata printks to pr_xxx macros.
3b6ed4a [S390] convert setup printks to pr_xxx macros.
f55495b [S390] convert hypfs printks to pr_xxx macros.
feab650 [S390] convert time printks to pr_xxx macros.
39f0939 [S390] convert cpacf printks to pr_xxx macros.
e6d5a42 [S390] convert cio printks to pr_xxx macros.
80a5c36 [S390] convert vmur printks to pr_xxx macros.
2f526e5 [S390] convert cpcmd printks to pr_xxx macros.
c99fc5d [S390] convert lcs printks to dev_xxx and pr_xxx macros.
8988e58 [S390] convert vmcp printks to pr_xxx macros.
d1c2f89 [S390] convert xpram printks to pr_xxx macros.
acfa922 [S390] s390: Remove redundant test
0946100 [S390] s390/setup: set default preferred console device "ttyS"
21e7b2c [S390] drivers/s390/crypto: Move dereference to after IS_ERR test
33b1d09 [S390] panic_stack leak in smp_alloc_lowcore
4f7e90d [S390] clear_table inline assembly contraints
c185b78 [S390] Remove config options.
349f1b6 [S390] cpu topology: remove dead code
2b1a61f [S390] cpu topology: introduce kernel parameter
9fee8db [S390] add new machine types to setup_hwcaps.
c58d92b [S390] Remove initial kernel stack backchain initialization.
64253ac [S390] s390: use the new byteorder headers
e37f50e [S390] Add processor type march=z10 and a processor type safety check.
b3b59d3 [S390] sclp vt220: fix compile warning
2d6cd2a [S390] remove warnings with functions ending in BUG
edd5378 [S390] mark disabled_wait as noreturn function
d36f0c6 [S390] cio: use pim to check for multipath.
f444cc0 [S390] cio: commit all pmcw changes.
13952ec [S390] cio: introduce cio_commit_config
cdb912a [S390] cio: introduce cio_update_schib
d6a3076 [S390] cio: Use device_is_registered().
283fdd0 [S390] cio: Dont call ->release directly.
90ed2b6 [S390] cio: Dont fail probe for I/O subchannels.
5fb6b85 [S390] cio: Only register ccw_device for registered subchannel.
6eff208 [S390] cio: Fix I/O subchannel refcounting.
9cd6742 [S390] cio: Fix reference counting for online/offline.
97166f5 [S390] cio: Put referernce on correct device after moving.
c619d42 [S390] cio: fix ccwgroup online vs. ungroup race condition
111e95a [S390] cio: move irritating comment.
d7b6048 [S390] cio: update sac values
191fd44 [S390] cio: get rid of compile warning
547e3ce [S390] remove ptrace warning on 31 bit.
32272a2 [S390] __page_to_pfn warnings
91d5d45 [S390] iucv: Locking free version of iucv_message_(receive|send)
44a01d5 [S390] s390/hvc_console: z/VM IUCV hypervisor console support
5d360a7 [S390] ftrace: function tracer backend for s390
98df67b [S390] struct device - replace bus_id with dev_name(), dev_set_name()
0cd4bd4 [S390] dasd: call cleanup_cqr with request_queue_lock
50afd20 [S390] dasd: correct sense byte condition for SIM
faf16aa [S390] dasd: Use accessors instead of using driver_data directly.
2bf373b [S390] dasd: improve dasd statistics proc interface
bd43a42 [S390] zfcp: Report microcode level through service level interface
6bcac50 [S390] service level interface.
7a0b4cb [S390] qdio: fix error reporting for hipersockets
50f769d [S390] qdio: improve inbound buffer acknowledgement
22f9934 [S390] qdio: rework debug feature logging
9a1ce28 [S390] qdio: fix compile warning under 31 bit
23589d0 [S390] qdio: add eqbs/sqbs instruction counters
bbd50e1 [S390] qdio: fix qeth port count detection
43c207e6 [S390] ap: Minor code beautification.
cb17a63 [S390] zcrypt: Use of Thin Interrupts
320c04c [S390] Move stfle to header file.
ca9fc75 [S390] convert s390 to generic IPI infrastructure
0b3016b [S390] serialize stp/etr work
750887d [S390] convert etr/stp to stop_machine interface
b020632 [S390] introduce vdso on s390
fc5243d [S390] arch_setup_additional_pages arguments
a114a9d [S390] vmcp: remove BKL
f414f5f [S390] cpu topology: dont destroy cpu sets on topology change
8f2961c [S390] audit: get s390 ret_from_fork in sync with other architectures
5439050 [S390] cpu topology: fix cpu_core_map initialization
5250d32 Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and
'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core
468a15b sched, trace: update trace_sched_wakeup()
a3eeeef Merge branch 'x86/tsc' into tracing/core
79a66b9 Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into
x86/core
1fcccb0 x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
5ce442f Merge branch 'topic/udev-id-rename' into to-push
60cda2b Merge branch 'topic/sound-core-fix' into to-push
9649745 Merge branch 'topic/snd-hrtimer' into to-push
a9c3c7e Merge branch 'topic/pcxhr-update' into to-push
cc49108 Merge branch 'topic/oxygen' into to-push
a802269 Merge branch 'topic/jack-mechanical' into to-push
a650562 Merge branch 'topic/hda' into to-push
313769d Merge branch 'topic/cs5535audio' into to-push
8afabfa Merge branch 'topic/convert-tasklet' into to-push
86b3aa3 Merge branch 'topic/ca0106' into to-push
e4456e7 Merge branch 'topic/audigy-capture-boost' into to-push
5c8261e Merge branch 'topic/asoc' into to-push
facef86 Merge branch 'topic/aoa' into to-push
0ca59dd tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
2a0d836 Merge branches 'cma', 'ehca', 'ipath', 'iser', 'mlx4' and 'nes' into
for-next
7798dbf IB/mlx4: Set ownership bit correctly when copying CQEs during CQ
resize
e189062 RDMA/nes: Remove tx_free_list
81ea714 smackfs: check for allocation failures in smk_set_access()
cbacc2c Merge branch 'next' into for-linus
0ee4a96 crypto: aes - Precompute tables
ca38a81 crypto: talitos - Ack done interrupt in isr instead of tasklet
bcf84a3 crypto: testmgr - Correct comment about deflate parameters
f0d1ec3 crypto: salsa20 - Remove private wrappers around various operations
ad79cdd crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
bd9d20d crypto: sha512 - Switch to shash
f9e2bca crypto: sha512 - Move message schedule W[80] to static percpu area
19e2bf1 crypto: michael_mic - Switch to shash
4946510 crypto: wp512 - Switch to shash
f63fbd3 crypto: tgr192 - Switch to shash
50e109b crypto: sha256 - Switch to shash
14b75ba crypto: md5 - Switch to shash
808a176 crypto: md4 - Switch to shash
54ccb36 crypto: sha1 - Switch to shash
3b8efb4 crypto: rmd320 - Switch to shash
d8a5e2e crypto: rmd256 - Switch to shash
e5835fb crypto: rmd160 - Switch to shash
7c4468b crypto: rmd128 - Switch to shash
d35d245 crypto: null - Switch to shash
3751f40 crypto: hash - Make setkey optional
b812eb0 crypto: testmgr - Validate output length in (de)compression tests
dad3df2 crypto: remove uses of __constant_{endian} helpers
664134d crypto: testmgr - Fix error flow of test_comp
5f459f0 crypto: hifn_795x - Use softirq kernel mapping in bh context
d6a10c8 crypto: hifn_795x - Fix queue management
3ec858d crypto: hifn_795x - Remove some unused cruft
ed4f92e crypto: hifn_795x - Fix queue processing
5df4c0c crypto: hifn_795x - Fix request context corruption
3416158 crypto: hifn_795x - Don't copy src sg list
75741a0 crypto: hifn_795x - Fix DMA setup
09fbf7c crypto: ansi_cprng - fix inverted DT increment routine
9302735 libcrc32c: Select CRYPTO in Kconfig
aa1a85d crypto: ansi_cprng - Avoid incorrect extra call to
_get_more_prng_bytes
31a61bf crypto: md4 - Use ARRAY_SIZE
0426c16 libcrc32c: Add crc32c_le macro
53b146a libcrc32c: Fix "crc32c undefined" compilation error
69c35ef libcrc32c: Move implementation to crypto crc32c
8e3ee85 crypto: crc32c - Test descriptor context format
b7e8bda crypto: crc32c-intel - Switch to shash
faccc4b crypto: crc32c - Switch to shash
5f7082e crypto: hash - Export shash through hash
67cd080 crypto: api - Call type show function before legacy for proc
dec8b78 crypto: hash - Add import/export interface
3b2f6df crypto: hash - Export shash through ahash
7b5a080b crypto: hash - Add shash interface
7b0bac6 crypto: api - Rebirth of crypto_alloc_tfm
4a77948 crypto: api - Move type exit function into crypto_tfm
2566578 crypto: ansi_cprng - Allow resetting of DT value
420a4b2 crypto: padlock - Avoid resetting cword on successive operations
1c06da8 crypto: crc32c-intel - Update copyright head
4b24ea9 crypto: talitos - Preempt overflow interrupts off-by-one fix
32bd78e crypto: camellia - use kernel-provided bitops, unaligned access
d12d6b6 crypto: testmgr - Trigger a panic when self test fails in FIPS mode
fe5720e crypto: talitos - Perform auth check in h/w if on sec 2.1 and above
1c2e881 crypto: talitos - Implement done interrupt mitigation
40405f1 crypto: talitos - Pass correct interrupt status to error handler
a44b56c crypto: hifn - Disable driver when physical size exceeds 32 bits
4a6908a Linux 2.6.28
67be403 Revert "x86: disable X86_PTRACE_BTS"
db8862e Merge branch 'linus' into tracing/hw-branch-tracing
c20137f Merge branch 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
1806f82 Merge branch 'x86-fixes-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2523659 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
1f5175a RDMA/cma: Add IPv6 support
38617c6 RDMA/addr: Add support for translating IPv6 addresses
7645c4b Merge branch 'fix/hda' into topic/hda
574f3c4 ALSA: hda - Add missing terminators in patch_sigmatel.c
40f15ad x86: disable X86_PTRACE_BTS
c1c15b6 x86: PAT: fix address types in track_pfn_vma_new()
6332178 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
5289f46 parisc: disable UP-optimized flush_tlb_mm
8960223 Merge branch 'drm-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
d519c8d edac: fix edac core deadlock when removing a device
20ca9b3 cgroups: avoid accessing uninitialized data in failure path
e368d3a cgroups: suppress bogus warning messages
f00a189 w1: fix slave selection on big-endian systems
cc6c2ca rtc: rtc-isl1208: reject invalid dates
98db8df ring-buffer: prevent false positive warning
a8ccf1d ring-buffer: fix dangling commit race
bed4f13 Merge branch 'x86/irq' into x86/core
3e5621e Merge branch 'x86/iommu' into x86/core
be9a1d3 Merge branch 'x86/tsc' into x86/core
7e3cbc3 Merge branch 'x86/ptrace' into x86/tsc
fa623d1 Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature',
'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc',
'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io',
'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr',
'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace',
'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal',
'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
bf8bd66 Merge branch 'x86/apic' into x86/irq
1ccedb7 Merge commit 'v2.6.28-rc9' into x86/apic
231ffc9 V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to
VIDIOC_INT_RESET command
908a7a1 net: Remove unused netdev arg from some NAPI interfaces.
f8f50b1 powerpc/32: Wire up the trampoline code for kdump
ccdcef7 powerpc/32: Add the ability for a classic ppc kernel to be loaded at
32M
01695a9 powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
6f29c32 powerpc/32: Setup OF properties for kdump
7375331 powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
322b439 powerpc: Prepare xmon_save_regs for use with kdump
5be8554 powerpc: Remove default kexec/crash_kernel ops assignments
77733f8 powerpc: Make default kexec/crash_kernel ops implicit
2e8e4f5 powerpc: Setup OF properties for ppc32 kexec
b906cfa powerpc/pseries: Fix cpu hotplug
fad7b9b powerpc: Fix KVM build on ppc440
889bd9b net: startup race in hso driver
05a8c1c pkt_sched: Remove smp_wmb() in qdisc_watchdog()
4707470 r6040: bump release number to 0.19
3e7c469 r6040: save and restore MIER correctly in the interrupt routine
11e5e8f r6040: fix wrong logic in mdio code
5f2f6da net: Fix oops in dev_ifsioc()
adf77ba x86: prioritize the FPU traps for the error code
077ebed drm/radeon: fix correctness of irq_enabled check for radeon.
c47a75a Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
0099f77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
9ecab6e drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
def434c powerpc/cell: add QPACE as a separate Cell platform
e68558d powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
2e85696 Merge branch 'upstream' of
git://ftp.linux-mips.org/pub/scm/upstream-linus
7ef5f41 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
472346d ALSA: ASoC: fix a typo in omp-pcm.c
c691348 ASoC: Fix DSP formats in SSM2602 audio codec
bd25867 ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
f5eda57 mlx4_core: Delete incorrect comment
b8dd786 mlx4_core: Add support for multiple completion event vectors
59de580 sh: oprofile: Fix up the module build.
7d91fcf sh: add UIO support for JPU on SH7722.
b0c50ad serial: sh-sci: Fix up port pinmux for SH7366.
6f5cd2b sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
2ea40de sh: mach-sh03: Fix up pata_platform build breakage.
b5868e8 sh: enable deferred io LCDC on Migo-R
8564557 video: sh_mobile_lcdcfb deferred io support
37b4837 video: deferred io with physically contiguous memory
6e1038a video: deferred io cleanup
87884bd video: fix deferred io fsync()
0790555 sh: add LCDC interrupt configuration to AP325 and Migo-R
2540c11 sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
da9fdc8 sh: split coherent pages
78fb402 sh: dma: Kill off ISA DMA wrapper.
5d2685d sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
fe58cac sh: Kill off the unused SH_ALPHANUMERIC debug option.
740a3e6 sh: Enable skipping of bss on debug platforms for sh32 also.
8a65505 doc: Update sh cpufreq documentation.
0146d78 sh: mrshpc_setup_windows() needs to be inline.
1f6fd5c serial: sh-sci: sci_poll_get_char() is only used by
CONFIG_CONSOLE_POLL.
073da9c sh: Kill off cf-enabler with extreme prejudice.
8c197c3 sh: Add a simple edosk7705_defconfig for build testing.
866ef8f sh: mach-edosk7705: Fix up edosk7705 so it all builds again.
0ef0e6c sh: mach-microdev: Split out the fdc37c93xapm initialization code.
43eeb0f sh: mach-sh03: Use __set_io_port_base(), kill off special
ioport_map().
8db806e sh: mach-sh03: Move off of cf_enabler to pata_platform, as per
landisk.
98a955d sh: board-shmin: Convert shmin to use __set_io_port_base().
2125a46 sh: Kill off dead mv_init_pci() from machvec.
43f8f9b sh: Simplify kernel_thread_helper() for sh32.
7b80fb3 sh: Kill off mv_heartbeat() from the machvec.
b94ea27 sh: Kill off the cayman and microdev special heartbeat code.
ca0c14e44 sh: Kill off sh_bios_in_gdb_mode().
a9df1ed sh: export sh_bios_get_node_addr() symbol for stnic module.
8e32018 sh: Run sh_bios through a long overdue Lindent.
d570164 serial: sh-sci: Generalize port pin initialization.
d830fa4 serial: sh-sci: Tidy up fifo overrun error handling.
762c69e serial: sh-sci: pr_debug() -> dev_dbg() conversion.
027e687 serial: sh-sci: Fix up the cpufreq notifier to use the proper port
clock.
d9341b5 sh: oprofile: Convert op_model_sh7750 to new common interface.
40a8b42 sh: oprofile: Backtrace support.
60a51fb sh: oprofile: Refactor common setup code for multiple driver support.
70fe224 sh: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH machines
1a94757 sh: Convert Cayman boards from hw_interrupt_type to irq_chip
e85a477 sh: Convert Dreamcast support from hw_interrupt_type to irq_chip
bd0a22d sh: Convert SystemH board support from hw_interrupt_type to irq_chip
be729fd sh: Convert Microdev boards from hw_interrupt_type to irq_chip
180ae20 sh: Provide sdivsi3/udivsi3/udivdi3 for sh64, kill off libgcc linking.
209aa4f fb: SH-5 uses __raw I/O accessors now also, drop the special casing.
4466b20 sh: Add SH-5 optimized memcpy()/memset()/strcpy()/strlen().
776d6c2 sh: Kill off remaining CONFIG_SH_KGDB bits.
07d2a1a serial: sh-sci: Implement CONSOLE_POLL support and kill off old kgdb
console.
ab6e570 sh: Generic kgdb stub support.
d7b01f7 sh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that SH-5 supports it
too.
dd76279 sh: Provide linux/regset.h interface for SH-5.
94e2fb3 sh: Provide asm/syscall.h for SH-5.
6ac0343 sh: Handle cases where setup{_rt,}_frame() fail on SH-5 signal
delivery.
f15b2dc sh: Fix up syscall_get_nr() comment in syscall_32.h.
35724a0 sh: Fix up the cpu_asid() return value on nommu.
a99d6fd sh: Convert sh64 /proc/asids to debugfs and generic sh.
4d1f3bb sh: Kill off sh64's unused alloc/free_task_struct() definitions.
4eec883 sh: mach-migor: Kill off unused Migo-R machvec.
4545bfa sh: add ov772x reset delay on Migo-R
a6bc25a sh: Drop the special qemu defconfig.
bd40e81 sh: Delete unnecessary mov in the interrupt exception entry point.
06be372 sh: Fix an off-by-1 check in __mutex_fastpath_unlock().
a47925f sh: Update rsk701_defconfig to reflect mach-rsk changes.
ff15b90 sh: Enable leds-gpio in rsk7203 defconfig.
ea0aac1 sh: Consolidate rsk7203/7201 in to a new mach-rsk.
b5cfeac sh: Provide ftrace_make_call()/ftrace_make_nop().
4bc3e71 sh: Disable -Werror for arch/sh/oprofile/.
3b04122 sh: Add plain udivsi3 (not _i4*) for gcc-4.1 and lower.
1fdae0e Fix incorrect use of loose in c-checksum.c
77ba93a sh: Fix up the SH-4A mutex fastpath semantics.
c6f17cb sh: allow CONFIG_CPU_IDLE
af998a9 sh: allow CONFIG_PM
3e51762 sh: move the hp6xx pm code
0464518 sh: update se7343 defconfig
21c601b sh: remove ioport cruft and smc91x from se7343
5e5aacb sh: add isp1161 usb host device to se7343
6aacba7 sh: add st16c2550 devices to se7343
5727003 sh: fix number of interrupts on se7343
551ea2b sh: sh7343 scif configuration update
0c0daec sh: propagate r_clk
6feb348 sh: RSK+ 7201 board support.
2825999 sh: Add support for SH7201 CPU subtype.
135210b sh: Switch HD64461 from hw_interrupt_type to irq_chip
331ff10 sh: pci-sh7780: fix pci memory address mask
22f131a sh: Provide a dyn_arch_ftrace struct definition.
1da1180 sh: Split out the idle loop for reuse between _32/_64 variants.
eb67cf1 sh: Consolidate cpu_relax()/cpu_sleep() definitions across _32/_64.
f74c034 sh: do not latency trace idle.
75fd24c sh: Tidy up backtrace formatting with kallsyms disabled.
9cfc9a9 sh: Add a simple code dumper for SUPERH32 show_regs().
edfd6da sh: Add a few more branch types to the branch emulator.
5dd6147 sh: Re-add support for best fit ISA tuning if none is available.
624c6a6 sh: More movmem alias symbol exports for older compilers.
95b781c sh: Provide optimized unaligned loads on SH-4A.
716777d sh: P4 ioremap pass-through
0c91223 sh: Add SH-4A optimized fastpath mutex implementation.
5c72f30 sh: sh7760fb: Add support SH7720/SH7721 of Renesas
679dc3c sh: sh7760fb: Fix color pallette setting
f617682 sh: add SH DMAC burst mode constant
c2c5883 sh: fix DMAOR register access on SH7709
8085ac7 sh: Add platform-specific constants for SH7709
0d5bbe0 sh: Provide optimized non-atomic bitops for SH-2A.
8bcc5c1 sh: Add -m4al tuning for SH4AL-DSP.
9ef1002 sh: Add exports for __udivsi3/__sdivsi3 and the _i4 versions.
16b529d sh: Convert to generic bitops for IRQ-toggling implementation.
709420d sh: Specify sane default image targets for the SH-2 platforms.
1aad54a sh: Migrate necessary libgcc bits in to arch/sh/lib for SUPERH32.
e9bf51e sh: __udivdi3 -> do_div() in softfloat lib.
00e825c sh: Fix clock framework compiler warnings.
d643510 usb: Fix up sh_mobile usbf clock framework warnings.
e7c98dc serial: sh-sci: Codestyle cleanup patch.
af505b1 media: sh_mobile_ceu_camera: Add HAVE_CLK dependency.
fad57fe sh: dynamic ftrace support.
ef6aff6 sh: remove old sh_mobile mstpc clocks
b51339f sh: sh_mobile lcdc clock framework support
765786e sh: sh_mobile usb clock framework support
af5be79 sh: sh_mobile usbf clock framework support
a42b6dd sh: sh_mobile ceu clock framework support
090d951 sh: sh_mobile keysc clock framework support
a5616bd sh: sh_mobile i2c clock framework support
f2eb010 sh: sh_mobile mstpcr clocks for sh7366
6e88d03 sh: sh_mobile mstpcr clocks for sh7343
f14c017 sh: sh_mobile mstpcr clocks for sh7723
ecf399b sh: sh_mobile mstpcr clocks for sh7722
7c7e02a sh: new sh_mobile mstpcr clocks base code
1dc7b77 sh: use arch_flags for sh_mobile mstpcr clock bits
d902d04 sh: sh_mobile clock divider index fix
d12cfac sh: enable and disable clocks recursively
4a4a9be sh: Move arch_get_unmapped_area() in to arch/sh/mm/mmap.c.
ed2b03e MIPS: MIPS64R2: Fix buggy __arch_swab64
08d9d1c MIPS: Fix preprocessor warnings flaged by GCC 4.4
826e08b sched: fix warning in fs/proc/base.c
d3d3170 tg3: Update version to 3.97
aa10f27 tg3: tg3.h cleanups
69fc405 tg3: Remove unused cfgspc device members
027455a tg3: Cleanup IPV6 LSO
2023276 tg3: WOL fixes
7f3ff4f pkt_sched: Annotate uninitialized var in sfq_enqueue()
bfb8cc3 ixgbe: fix the display of DCB control stats in ethtool
f4314e8 net: add DCNA attribute to the BCN interface for DCB
1486a61 net: fix DCB setstate to return success/failure
c2da953 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
59f8500 Convert ixp4xx_eth driver to use net_device_ops.
4cb56b6 drivers/net/wan: Remove redundant test
93bc933 HDLC_PPP: Fix Configure-Ack to return original options as required by
the standard.
e6da96a IXP4xx: move common debugging from network drivers to QMGR module.
9251ce9 Update MAINTAINERS entries for IXP4xx and WAN network drivers.
f5b89e4 WAN: Add IXP4xx HSS HDLC driver.
490b772 IXP4xx: Add ethtool support to Ethernet driver.
4954936 IXP4xx: Add PHYLIB MII ioctl to the Ethernet driver.
2098c18 IXP4xx: Add PHYLIB support to Ethernet driver.
b4c7d3b IXP4xx: Make the Ethernet driver use built-in netdev stats.
3c36a83 IXP4xx: Silence section mismatch warning in Ethernet driver.
ae2754a IXP4xx: clear IRQ stat in qmgr_disable_irq().
3edcfb2 IXP4xx: check for queue being empty in qmgr_release_queue().
bba7ebb IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
139cdab IB/ehca: Remove redundant test of vpage
418441d powerpc/mpc5200: fix error paths in PSC UART probe function
aec739e powerpc/mpc5200: add rts/cts handling in PSC UART driver
b651498 powerpc/mpc5200: Make PSC UART driver update serial errors counters
e51f47a powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
6b61e69 powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
aaab5e8 powerpc/mpc5200: Disable bestcomm prefetching when ATA DMA enabled
e4efe3c powerpc/mpc5200: Bestcomm fixes to ATA support
6228824 powerpc/mpc5200: Bugfix on handling variable sized buffer descriptors
dd952cb powerpc/mpc5200: Make internal 5200 PIC the default interrupt
controller
bcb73f5 powerpc/mpc5200: Document and tidy irq driver
a149535 powerpc: Fix missing 'blr' in _tlbia()
3ddeb91 ftrace: enable format arguments checking
49e6e3f powerpc/bootwrapper: Use the child-bus #address-cells to decide which
range entry to use
e14d774 powerpc: Const-qualify Device Node Argument to DCR Resource Extent API
9dce3ce powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
64b3d0e powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
7752035 powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
760ec0e powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
2a4aca1 powerpc/mm: Split low level tlb invalidate for nohash processors
f048aac powerpc/mm: Add SMP support to no-hash TLB handling
7c03d65 powerpc/mm: Introduce MMU features
2ca8cf7 powerpc/mm: Rework context management for CPUs with no hash table
5e69661 powerpc/mm: Split mmu_context handling
6d2170b powerpc/4xx: Extended DCR support v2
fecba96 powerpc: Add reboot notifier to Collaborative Memory Manager
2218108 powerpc: Disable Collaborative Memory Manager for kdump
5d84e4b powerpc/iseries: viodasd needs to depend on CONFIG_BLOCK
368c1e3 hvc_console: Escape magic sysrq key
532774e powerpc: Pass a valid token to rtas_call() in phyp-dump code
7a2eab0 powerpc: Protect against NULL pointer deref in phyp-dump code
8168b54 powerpc: Rename struct vm_region to avoid conflict with NOMMU
13ba3c0 powerpc: Convert sysfs cache code to of_find_next_cache_node()
b2ea25b powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
e523f72 powerpc: Add of_find_next_cache_node()
7498209 of/gpio: Implement of_gpio_count()
7736a3d of: of_parse_phandles_with_args() learns to differentiate 'hole' cells
c1bb7c6 of: Minor simplification for the of_parse_phandles_with_args()
74b7ff4 ALSA: hda: fix incorrect mixer index values for 92hd83xx
f8ccbf6 ALSA: hda: dinput_mux check
ebef7cf Merge branch 'topic/ca0106-spdif-stream' into topic/ca0106
6bcdbd5 Merge branch 'topic/ca0106-resume' into topic/ca0106
6a84364 Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
8326e32 Merge branch 'topic/hda-resume-fix' into topic/hda
55fa518 Merge branch 'topic/pcsp-fix' into topic/misc
69dfaef ALSA: hda - Add quirk for another HP dv7
a31501d ALSA: ASoC - Add missing __devexit annotation to wm8350.c
d6f8339 ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
9e03162 ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
a24f4f6 ALSA: ASoC: tlv320aic3x add dsp_a
07d8d9d ALSA: ASoC: DaVinci: document I2S limitations
69ab820 ALSA: ASoC: DaVinci: davinci-i2s clean up
21903c1 ALSA: ASoC: DaVinci: davinci-i2s clean up
664b4af ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
1152a19 ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
ff75427 ALSA: ca0106 - disable 44.1kHz capture
72077aa ALSA: ca0106 - Add missing card->private_data initialization
50232d6 ALSA: ca0106 - Check ac97 availability at PM
c5dee61 x86, bts: memory accounting
bf53de9 x86, bts: add fork and exit handling
67bac79 x86: PAT: pfnmap documentation update changes
34801ba x86: PAT: move track untrack pfnmap stubs to asm-generic
982d789 x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
d87fe66 x86: PAT: modify follow_phys to return phys_addr prot and return value
6bd9cd5 x86: PAT: clarify is_linear_pfn_mapping() interface
8403295 x86: ia32_signal: remove unnecessary declaration
34945ed x86: common.c boot_cpu_stack and boot_exception_stacks should be
static
7419224 SELinux: don't check permissions for kernel mounts
12204e2 security: pass mount flags to security_sb_kern_mount()
459c19f SELinux: correctly detect proc filesystems of the form "proc/foo"
9bb4824 allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
ad7a953 kbuild: strip generated symbols from *.ko
37a8d9f kbuild: simplify use of genksyms
9cf7f24 b43: Add key memory dumping
b929ecf b43: Suspend MAC while killing the radio
fd6effc ath5k: correct packet length in tx descriptors
520eb82 mac80211: implement dynamic power save
ce7c911 mac80211: track master queue status
e0cb686 mac80211: enable IEEE80211_CONF_PS only when associated
d10d0e5 b43: Fix some MAC locking
0e7690f iwlwifi: iwl-tx.c cleanup (remove unused parameter and unused local
variable).
be2864c ath9k: Fixed RX decryption status reporting
ea61213 ath9k: Fix key cache slot selection for splitmic
aa33de0 ath9k: Protect config() callback with a mutex
5e3f308 mac80211: Print unknown packet type in tasklet_handler
6110781 p54usb: bring first generation devices back to life
6ace289 ath9k: Key cache allocation for AP mode
f66000f ath9k: Fix a NULL pointer dereference in ath_rate_get
91f39e8 iwlwifi: indicate txpower is off in sysfs
f1bc4ac iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
4087f6f iwlwifi: use meaningful vars in _iwl_poll_bit()
febf337 iwlwifi: remove useless goto
95aa194 iwlwifi: use type uint for module param debug
c3a739f iwlwifi: update comments on the debug interface
5c11ec6 iwlwifi: add line feed to printk
34c22cf iwlwifi: cleanup iwl-dev.h
1355412 mac80211: fix a typo in ieee80211_send_assoc() method.
73ec1cc iwlwifi: remove a parameter (dest) from *_fill_beacon_frame() methods.
ca8a856 ath9k: Move rate control alg register/unregister to appropriate place
9bf9fca ath9k: Synchronize DMA transfer with CPU at right place
f7a276a ath9k: Remove MAC header pad before reporting TX status
da027ca ath9k: Fix TX status reporting for retries and MCS index
8d6f658 mac80211: Remove radiotap rate-present flag for HT
d858822 rtl8187: Fix crash on unload when using SLUB debug
0a5ec96 p54: remove free_on_tx parameter
69ba3e5 p54: more accurate rssi to dBm conversion
da9f57e rtl8187: Fix error returns
2382792 libertas: use roundup instead of opencoding
ee370ce p54: update ACK failure statistic counter in real-time
54fdb04 p54: move statistic timer update routine into a workqueue
d5e4903 iwlagn: fix agn rate scaling
b8d476c mac80211: Send Layer 2 Update frame on reassociation
0fe45b1 ath5k: fix 802.11 header padding on RX, unpadding on TX
baad1d9 ath9k: Report HT rates in RX status
0fb8ca4 mac80211: Add HT rates into RX status reporting
9d8eed1 ath9k: Do not use association state to update rate table
094d05d mac80211: Fix HT channel selection
420e7fa nl80211: Add signal strength and bandwith to nl80211station info
a1d94aa kernel-doc: check for extra kernel-doc notations
eb63212 ALSA: hda - Power up always when no jack detection is available
213cc06 ftrace: introduce tracing_reset_online_cpus() helper
9158923 ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
6030634 Merge branch 'topic/hda-stac-fix' into topic/hda
7004305 Merge branch 'fix/asoc' into topic/asoc
d4d9cd03 ALSA: hda - Add probe_only option
7662453 ALSA: hda - Use more distinct name for a unique volume in STAC/IDT
c21ca4a ALSA: hda - Rework on STAC/IDT auto-configuration code
03c6901 Merge branch 'fix/hda' into topic/hda
8df0f70 ALSA: ca0106 - Fix typo in resume code
692f904 ALSA: hda - Fix HD-Audio.txt reference of model list
3d47582 ALSA: ca0106 - Add IEC958 PCM Stream controls
86effd7 ALSA: ca0106 - Don't override the values at resume
abe1dfa ACPI: don't cond_resched() when irqs_disabled()
e76f427 ACPI: fix 2.6.28 acpi.debug_level regression
4f2d23e ALSA: hda - Use snd_hda_ctl_add() in patch_sigmatel.c
827057f ALSA: hda - Add missing initializations of amp and verb caches
30cd324 Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and
'tracing/urgent' into tracing/core
345077c x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
cae5117 ALSA: split HD-audio model list to HD-Audio-Models.txt
335b986 Merge branch 'topic/hda-doc' into topic/hda
0ff5551 Merge branch 'fix/hda' into topic/hda
c94cb31 net: prepare usb net drivers for addition of status as a parameter
ab5024a net: ppp_generic - use DEFINE_IDR for static initialization
a109a5b cxgb3: manage private iSCSI IP address
221b3d6 ucc_geth: Remove UGETH_FILTERING dead code
3e73fc9 ucc_geth: Fix IO memory (un)mapping code
ba57469 ucc_geth: Cleanup repetitive ucc_geth_memclean() calls
67c2fb8 ucc_geth: Fix IRQ freeing code in ucc_geth_open()
1762a29 ucc_geth: Fix TX watchdog timeout handling
b3431c6 ucc_geth: Fix endless loop in stop_{tx,rx} routines
6086ebc tcp: Stop scaring users with "treason uncloaked!"
e98def1 NIU: Implement discard counters, optimize
d231776 NIU: Implement discard counters, info/debug statements.
b8a606b NIU: Implement discard counters
5664dd5 enc28j60: reduce the number of spi transfers in enc28j60_set_bank()
b88a2a2 netdevice zd1201: Use after free
3de77cf Revert "xfrm: Accept ESP packets regardless of UDP encapsulation mode"
739840d ppp: fix segfaults introduced by netdev_priv changes
1b08534 net: Fix module refcount leak in kernel_accept()
f34a10b x86: fix warning in arch/x86/kernel/microcode_amd.c
c71dd42 tracing: fix warnings in kernel/trace/trace_sched_switch.c
3bddb9a tracing: fix warning in kernel/trace/trace.c
9f22149 x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
8869a2e x86: asm-offset_64: use rt_sigframe_ia32
b2fa739 x86: sigframe.h: include headers for dependency
d1769d5 x86: traps.c declare functions before they get used
a2ced6e x86: PAT: update documentation to cover pgprot and remap_pfn related
changes - v3
2520bd3 x86: PAT: add pgprot_writecombine() interface for drivers - v3
8a7b12f x86: PAT: change pgprot_noncached to uc_minus instead of strong uc -
v3
5899329 x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
2ab6403 x86: PAT: hooks in generic vm code to help archs to track pfnmap
regions - v3
e121e41 x86: PAT: add follow_pfnmp_pte routine to help tracking pfnmap pages
- v3
3c8bb73 x86: PAT: store vm_pgoff for all linear_over_vma_region mappings - v3
f0bc220 x86: process.c declare c1e_remove_cpu before they get used
5c2628e x86: sigframe.h: add guard macro
f269b07 x86: revert CONFIG_RELOCATABLE=y defconfig change
179efcb kbuild: add headerdep used to detect inclusion cycles in header files
40aa4a3 ASoC: Add WM8350 AudioPlus codec driver
b8b33cb ASoC: Complain if we fail to create DAPM controls
0b34a3d ASoC: Ease merge difficulties from new architectures
9c2c480 schedstat: consolidate per-task cpu runtime stats
6d102bc tracing/ring-buffer: remove unused ring_buffer size
7c9c160 x86: tls.c declare sys_set_thread_area and sys_get_thread_area before
they get used
57a3750 x86: time_64.c timer_interrupt() should be static
3d9101e trace: fix task state printout
ea3a6d6 ftrace: add not to regex on filtering functions
e05a43b trace: better use of stack_trace_enabled for boot up code
f38f1d2 trace: add a way to enable or disable the stack tracer
4087449 Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into
tracing/core
1f04128 ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule()
d98f9d8 x86: ia32_signal: use sigframe.h
3b0d29e x86: ia32_signal: rename struct sigframe and rt_sigframe
c85c2ff x86: signal: prepare to include from ia32_signal.c
41af86f x86: signal: move sigframe.h to arch/x86/include/asm
a5c56eb x86: signal: rename sigframe and rt_sigframe on 32-bit
f522376 x86: signal: move ia32 func declarations into arch/x86/kernel/signal.c
3218c17 ALSA: hda - Remove duplicated strings from codec name
74c6113 ALSA: hda - Add Intel vendor id string
49ad959 Revert "net: release skb->dst in sock_queue_rcv_skb()"
3b5b35d bonding: use port_params in __update_lacpdu_from_port
3c52065 bonding: use port_params in __update_default_selected()
ce6a49a bonding: use port_params in __update_selected()
a6ae186 bonding: remove various function declarations
c7e703d bonding: init port_params from template
5eefd1a bonding: use plain memcpy in __record_default()
b99d6ba bonding: use port_params in __record_pdu()
1055c9a bonding: introduce and use port_params structure
aa31281 bonding: improve elaborate port_state assignment
4219988 gianfar: Continue polling until both tx and rx are empty
8c7396a gianfar: Merge Tx and Rx interrupt for scheduling clean up ring
c50a5d9 gianfar: Use interface name in interrupt name to distinguish the
source.
4669bc9 gianfar: Add Scatter Gather support
8882d9a gianfar: Fix packet drop when out of memory
a693722 dccp_diag: LISTEN sockets don't have CCIDs
c280266 Merge branch 'linux-2.6' into next
9732d52 Phonet: USB CDC Phonet function for gadget framework
893873f Phonet: get rid of deferred work on the transmission path
be67773 Phonet: use atomic for packet TX window
57c81ff Phonet: allocate separate ARP type for GPRS over a Phonet pipe
2d91d78 Phonet: allocate a non-Ethernet ARP type
fc10af8 vcan: whitespace fixes
a67534a V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
7a95d26 net: ppp_generic - use idr technique instead of cardmaps
c0700f9 bnx2x: Fix namespace collision with FLOW_CTRL_{TX,RX}
f6d5243 bnx2: Don't redefine FLOW_CTRL_{RX,TX}.
1f2435e bnx2: Update version to 1.9.0.
4e1d0de bnx2: Rename MSI-X vectors.
eddce36 Merge branch 'next' of
master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into next
f40e063 drivers/net/hamradio: Move a dereference below a NULL test
f162e97 phylib: Remove unnecessary "reset" fixups in genphy_setup_forced
5a5efed gianfar: Make all BD status writes 32-bit
31de198 gianfar: Add macros for stepping through BDs
a22823e gianfar: Remove unused gfar_add_fcb() function parameter
2c2db48 gianfar: Enable padding and Optimize the frame prepended bytes
handling
77ecaf2 gianfar: Fix VLAN HW feature related frame/buffer size calculation.
12dea57 gianfar: Fix eTSEC configuration procedure
b46a845 gianfar: Optimize interrupt coalescing configuration
b31a1d8 gianfar: Convert gianfar to an of_platform_driver
d680fe4 x86: entry_64 - introduce FTRACE_ frame macro v2
66896a8 tracing/ftrace: add the printk-msg-only option
2c2d732 tracing/ftrace: use preempt_enable_no_resched_notrace in
ring_buffer_time_stamp()
257d938 gianfar: Use gfar_halt to stop DMA in gfar_probe
5eeabf5 tlan: Remove broken support for big buffers
354ade9 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
8bee3f0 x86: ia32_signal: use proper macro __USER32_DS
d0b48ca x86: ia32_signal: use __put_user() instead of __copy_to_user()
ae417bb x86: signal: use signal_fault() in sys_sigreturn()
c8182f0 sgi-xp: xpc needs to pass the physical address, not virtual
189f67c x86: UV fix for global physical addresses
c15cb37 Merge commit 'v2.6.28-rc8' into x86/uv
fde9071 x86: clean up dead code in vmi_32.c
8ae9366 x86: hardirq: use inc_irq_stat() in non-unified functions
e1286f2 x86: documentation fix regarding boot protocol
78f902c Merge commit 'v2.6.28-rc8' into x86/doc
ecbf29c xen: clean up asm/xen/hypervisor.h
80f40ee sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
a9b43c7 x86: setup.c find_and_reserve_crashkernel should be static
c0195b6 x86: ldt.c declare sys_modify_ldt before they get used
7b5b50f x86: signal.c declare do_notify_resume before they get used
aab02f0 x86: process_64.c declare __switch_to() and sys_arch_prctl before
they get used
f63c2f2 xen: whitespace/checkpatch cleanup
40fb171 x86: support always running TSC on Intel CPUs
7e91a12 Merge branch 'x86/cpufeature' into x86/tsc
d437797 x86: support always running TSC on Intel CPUs, add cpufeature
definition
dd7a523 Merge commit 'v2.6.28-rc8' into x86/cpufeature
df23cab x86: microcode_amd: modify log messages
5549b94 x86: microcode_amd: use 'packed' attribute for structs
9841530 x86: microcode_amd: remove (wrong) chipset deivce ID checks
6cc9b6d x86: microcode_amd: consolidate macro definitions
29d0887 x86: microcode_amd: replace inline asm by common rdmsr/wrmsr functions
0657d9e x86: microcode_amd: don't pass superfluous function pointer for
get_ucode_data
8c13520 x86: microcode_amd: fix compile warning
be95776 x86: microcode_amd: fix checkpatch warnings/errors
2a3282a x86: microcode_amd: fix typos and trailing whitespaces in log messages
3c763fd x86: microcode_amd: fix wrong handling of equivalent CPU id
3ca81a5 V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
8b21c1e V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
f86d4a9 V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
11c6c7f V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2
support)
4b330be V4L/DVB (9780): dib0700: Stop repeating after user stops pushing
button
b6fd6f2 x86, mm: limit MAXMEM on 64-bit
cfc3198 x86, 32-bit: improve lazy TLB handling code
beeb419 x86, 32-bit: add some compile time checks to mem_init()
d6be89a x86, 32-bit: simplify alloc_low_page()
b93a531 allow bug table entries to use relative pointers (and use it on
x86-64)
1796316 x86: consolidate __swp_XXX() macros
d072c25 x86, bts: correctly report invalid bts records
cc1dc6d x86, bts: remove recursion from get_context
bb1f24b ALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1
f649a71 ALSA: ca0106 Add comments to snd_ca0106_details struct
31117b7 ALSA: hda - Add Nvidia vendor id string
e9515c3 sched, cpuacct: export percpu cpuacct cgroup stats
720f549 sched, cpuacct: refactoring cpuusage_read / cpuusage_write
9dfc3bc Merge branches 'tracing/fastboot', 'tracing/ftrace',
'tracing/function-graph-tracer' and 'tracing/hw-branch-tracing' into
tracing/core
9f690db ipv6: fix the outgoing interface selection order in udpv6_sendmsg()
f250dcd ipv6: fix the return interface index when get it while no message is
received
b24a251 ipv6: Add IPV6_PKTINFO sticky option support to setsockopt()
bc02ff9 net: Refactor full duplex flow control resolution
e18ce34 net: Move flow control definitions to mii.h
f986732 simeth: convert to net_device_ops
8207bef cxgb3: untie strict FW matching
5ad258c vcan: convert to net_device_ops
ffcebb1 l2tp: fix UDP checksum support
09a2c3c Phonet: improve GPRS variable names
4ee59d5 isdn: eicon: fix sparse warning: make global functions static
205516c x86: convert rdtscll() to use __native_read_tsc
b187920 ipmr: merge common code
c40cf51 hp100: use roundup instead of open coding
82ad332 cxgb3: Add multiple Tx queue support.
34f28ec sched: optimize update_curr()
03e89e4 sched: fix wakeup preemption clock
89c88b1 e1000e: Add GRO support
b240a0e ethtool: Add GGRO and SGRO ops
bf296b1 tcp: Add GRO support
71d93b3 net: Add skb_gro_receive
73cc19f ipv4: Add GRO infrastructure
d565b0a net: Add Generic Receive Offload infrastructure
1a881f2 net: Add frag_list support to GSO
89319d3 net: Add frag_list support to skb_segment
b53c758 rapidio: struct device - replace bus_id with dev_name(),
dev_set_name()
aab0d37 powerpc: struct device - replace bus_id with dev_name(),
dev_set_name()
f63837f powerpc/mm: Remove flush_HPTE()
e41e811 powerpc/mm: Rename tlb_32.c and tlb_64.c to tlb_hash32.c and
tlb_hash64.c
1a37a3f powerpc/mm: Add local_flush_tlb_mm() to SW loaded TLB implementations
a58f053 powerpc: Fix asm EMIT_BUG_ENTRY with !CONFIG_BUG
3045b3c powerpc: Remove dead BIO_VMERGE_BOUNDARY definition
7fe519c powerpc: Introduce ppc_pci_flags accessors
edc72ac powerpc/pseries: Check for GIQ indicator before calling set-indicator
6ff04c5 powerpc/powermac: Use set_hard_smp_processor_id() instead of
smp_hw_index
13a9801 powerpc: Move smp_hw_index to 32-bit code
6b82b3e powerpc: Remove `have_of' global variable
eb14f01 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
0efbb57 powerpc: Fix !CONFIG_PPC_NEED_DMA_SYNC_OPS build warning
46d0149 powerpc/ps3: Add sub-match id modalias support
62d8074 powerpc/ps3: Quiet dmesg output
15cb1cc powerpc: Fix typo in pgtable-ppc64.h
29e931c powerpc/chrp: Add missing of_node_put in pci.c
1e1c568 Merge branch 'merge' into next
9a4a842 8390/8390p: Fix compat netdev ops handling.
91cac62 powerpc/85xx: Fix compile issues with mpc8572ds.dts
8309ce7 powerpc: Fix bogus cache flushing on all 40x and BookE processors v2
3d1ee37 ALSA: Fix declaration of sound_class
8b124a8 net: fix dcbnl_setnumtcs operation check
5ecc361 ixgbe: fix dma mapping unbalance
a7276db smsc9420: add ethtool register dump support
b1721d2 rpc/rdma: goto instead of copypaste
79f55f1 nf/dccp: merge errorpaths
e780f1c irda: merge exit paths
037322a bt/rfcomm/tty: join error paths
0eae1b9 ax25: join the return paths that free skb
ebad5c0 can: merge error paths
d8eb930 xfrm: join error paths
8da73b7 ip6mr: use goto to common label instead of opencoding
448eb71 ipv6/mcast: join error paths using goto
5ce1bbb xfrm6_tunnel: join error paths using goto
857a6e0 icsk: join error paths using goto
9cd28ab ASoC: switch davinci DPRINTK to pr_debug()
a6ba0cb kbuild: fix string equality testing in tags.sh
709cc37 kbuild: fix make tags/cscope
31110eb kbuild: fix make incompatibility
012b215 smsc9420: add ethtool eeprom support
e312674 smsc9420: add netpoll support
1757ab2 smsc911x: make smsc911x_poll_controller static
56bde88 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
a7a81fc sfc: Version 2.3
7dde596 sfc: Fix synchronisation of efx_mtd_{probe,rename,remove}
0c53d8c sfc: Use kzalloc() to ensure struct efx_spi_device is fully
initialised
fa402b2 sfc: Treat probe as unsuccessful if it scheduled a reset
ab37735 sfc: Use model numbers for PHY type names
ca54a9f sfc: Use mutex_lock_interruptible() for ethtool EEPROM access
11e6696 sfc: Specify a meaningful component for loopback RX-side and PHY tests
b453193 sfc: Remove leading spaces
6f158d5 sfc: Add support for SFN4111T
e6fa2eb sfc: Add support for Solarflare 10Xpress SFT9001
766ca0f sfc: Rework MAC, PHY and board event handling
04cc8ca sfc: Implement auto-negotiation
177dfcd sfc: Add support for sub-10G speeds
356eebb sfc: Clean up MDIO flag setting
04300d2 sfc: Clean up board identification
06d5e19 sfc: Add phy_type device attribute
27dd2ca sfc: Add support for MMDs numbered >15
f31a45d sfc: Remove MII extension cruft
5005087 sfc: Don't count RX checksum errors during loopback self-test
740ced9 sfc: Abbreviate self-test names so they are not truncated
56536e9 sfc: Provide hints to irqbalance daemon
28b581a sfc: Add option to use a separate channel for TX completions
84ae48f sfc: Restore phy_flash_cfg module parameter
2f7f573 sfc: Work around unreliable strap pins
be4ea89 sfc: Clean up waits for flash/EEPROM operations
1ab0062 sfc: Make reset_workqueue driver-global rather than per-NIC
65f667f sfc: Correct interpretation of second param to ethtool phys_id()
2b2734d sfc: Remove unneeded register write
23d30f0 sfc: Change SPI lengths to type size_t
a17102b sfc: Board support fixes
702c790 misdn: Fix lockdep warning
c31655f mISDN: hfcmulti: use __iomem address space modifier
c46f0a2 mISDN: timerdev: use __user for mISDN_read's buffer argument
047ce8f mISDN: comment out unused symbols
863a76e mISDN: fix sparse warning: symbol 'id' shadows an earlier one
bb68b1d mISDN: fix sparse warning: symbol 'nskb' shadows an earlier one
65a4051 mISDN: un-export symbol 'plx_lock'
5b83435 mISDN: make global symbols static or include header files
dfa96ec mISDN: consistently define 'debug' as '*u_int'
bcf9174 mISDN: use NULL pointer instead of plain integer
a7b7520 iwlwifi: add contact email to MODULE_AUTHOR
2aa6ab8 iwlwifi: remove 4965 from common uCode API structures
b5047f7 iwlwifi: remove includes of iwl-helpers.h where not needed
29d51d9 iwlwifi: remove unused clip_groups priv member
edb3422 iwlwifi: fix resume while txpower off
3d5717a iwlwifi: use iwl_poll_direct_bit in EEPROM reading
9c5f89b ath9k: Do not remove header padding on RX from short frames
f2f1ba2 iwlwifi: fix build warning (iwl-rx.c)
ab1f5c0 mac80211: misc cleanups
4dec9b8 rfkill: strip pointless notifier chain
6fb5325 libertas: Create sysfs entry for changing the mesh probe response
limit
b77f483 ath9k: Refactor struct ath_softc
59651e8 p54: fix oops on faulty devices
b7a530d mac80211: Disable requests for new scans in AP mode
14a4dfe ipw2200: fix scanning while associated
d8004cb b43legacy: Fix sparse warnings
c1db52b rtl8187: Use usb anchor facilities to manage urbs
388cdf3 ath5k: fix endianness of bitwise ops when installing mic
62d714e spectrum_cs: Fix function names used in debug strings
499b702 orinoco: Fix inappropriate use of IRQ_BAP
0c06dd8 orinoco: Fix function names used in debug strings
39ca5bb p54: enforce strict tx_queue limits
30dab79e iwlwifi: remove qos module parameter
6d1ef1a iwlwifi: 3945 remove qos module parameter
9f92593 iwlifi: remove twice defined SINGLE_FRAME RX FH MASK
759ef89 iwlwifi: change email contact information
d070d85 airport: remove useless return in a function returning void
89fad57 mac80211: integrate sta_notify_ps cmds into sta_notify
dd397dc p54usb: rewriting rx/tx routines to make use of usb_anchor's
facilities
a07d361 ath9k: BH shouldn't be enabled when hardirqs are disabled.
b143923 mac80211/cfg80211: check endianness in sparse runs
f546638c mac80211: remove fragmentation offload functionality
e4f2a34 ath9k: remove fragmentation workaround again
21a49fc iwlwifi: fix build error (iwl-rx.c).
8dffff2 mac80211: only create default STA interface if supported
0f202aa ieee80211_security: correct warning about width of auth_mode
8aa15e1 ath9k: avoid rx frames with corrupted descriptor.
2df1bff ath9k: Incorrect band enum causes invalid antenna configuration.
e759407 ath9k: Adding support for Atheros AR9285 chipset.
e8fbc99 ath9k: Adding initvalues for Atheros AR9285 chipset.
02e90d6 ath9k: Adding AR9285 chipset register information.
306d611 cfg80211: fix nl80211 frequency handling
7ba1c04 mac80211: improve sta_notify documentation
8ee5afb ath9k: Merge structures ath_atx, ath_node_aggr with ath_node
f6688cd ath9k: Remove remaining occurrences of CONFIG_SLOW_ANT_DIV
817e11d ath9k: Add a debugfs file to show interrupt statistics
3706de6 ath9k: Maintain rate table choice after association
40990ec ath9k: Fix bug in rate table management
6b3aa6a ath9k: Disable staggered Beacon frame scheduling
3fbb9d9 ath9k: Free Beacon skbs in AP mode
61ff84a iwlwifi: cleanup (remove pm_state)
a8ec42c iwlwifi: use rmb/wmb to protect indirect mmio operation
73d7b5a iwlwifi: iwl_poll_{direct_}bit cleanup
42802d7 iwlwifi: fix "MAC in deep sleep" error
f056658 iwlwifi: fix time interval misuse in iwl_poll_{direct_}bit
7262796 iwl3945: Fix rate scale for B-mode connection
00e540b iwlwifi: implement iwl_debug_report_frame for iwlagn
447107f mac80211: remove WARN_ON() from ieee80211_hw_config
bb608e9 wireless: Incorrect LEAP authentication algorithm identifier.
a7db74f rtl8187: Improve wireless statistics for RTL8187
fd28a5b x86: remove simnow earlyprintk support
9470565 x86: remove init_mm export as planned for 2.6.26
d65bd5e sched: add missing arch_update_cpu_topology() call
ee79d1b sched: let arch_update_cpu_topology indicate if topology changed
2bed844 tracing/function-graph-tracer: add a new .irqentry.text section, fix
cbc34ed sched: fix tracepoints in scheduler
915b0d0 x86: hardirq: introduce inc_irq_stat()
fd10902 Merge commit 'v2.6.28-rc8' into x86/irq
8f2466f x86: kill #ifdef for exit_idle()
16855f8 x86: uaccess: return value of __{get|put}_user() can be int
e18d7af Merge commit 'v2.6.28-rc8' into x86/mm
f8b755a tracing/function-graph-tracer: Output arrows signal on hardirq
call/return
bcbc4f2 tracing/function-graph-tracer: annotate do_IRQ and
smp_apic_timer_interrupt
a0343e8 tracing/function-graph-tracer: add a new .irqentry.text section
85072bd x86, debug: remove EBDA debug printk
c1dfdc7 Merge commit 'v2.6.28-rc8' into sched/core
da485e0 tracing/fastboot: include missing headers
8001530 tracing/fastboot: fix len of func buffer
8808500 x86: soften multi-BAR mapping sanity check warning message
ffc2238 x86, bts: fix build error
a93751c x86, bts, ftrace: adapt the hw-branch-tracer to the ds.c interface
c272477 x86, bts: provide in-kernel branch-trace interface
b0884e2 x86, bts: turn BUG_ON into WARN_ON_ONCE
f3134de Merge branches 'tracing/function-graph-tracer' and
'tracing/ring-buffer' into tracing/core
7a3c66e net: Add support for the KS8695 ethernet devices.
82a9928 tc35815: Enable StripCRC feature
2cb3772 smsc9420: SMSC LAN9420 10/100 PCI ethernet adapter
ea943d4 igb: fixup AER with proper error handling
49d92c7 ASoC: TWL4030: hands-free start-up sequence.
4544f8a ASoC: Fix variable name for Blackfin I2S DAI
cd85400 powerpc/4xx: Add L2 cache node to AMCC Canyonlands dts file
132bb7c ALSA: hda - Add development tree URLs in HD-audio.txt
f8bbd06 ALSA: hda - Fix another typo in HD-Audio.txt
42a73df ALSA: sb8 - Fix a return code in the error path
5c0b9be ALSA: hda - Fix a compile warning when CONFIG_PM=n
6de45d5 ALSA: ASoC - Fix DAI registration in s3c2443-ac97.c
623b9f6 ALSA: hda - Update HD-Audio.txt
293a4f2 netfilter: xt_NFLOG is dependant of nfnetlink_log
8229efd netns: ip6mr: enable namespace support in ipv6 multicast forwarding
code
8b90fc7 netns: ip6mr: declare ip6mr /proc/net entries per-namespace
950d570 netns: ip6mr: declare reg_vif_num per-namespace
a21f3f9 netns: ip6mr: declare mroute_do_assert and mroute_do_pim per-namespace
4045e57 netns: ip6mr: declare counter cache_resolve_queue_len per-namespace
4a6258a netns: ip6mr: dynamically allocate mfc6_cache_array
58701ad netns: ip6mr: store netns in struct mfc6_cache
4e16880 netns: ip6mr: dynamically allocates vif6_table
bd91b8b netns: ip6mr: allocate mroute6_socket per-namespace.
5eaa65b net: Make static
2107fb8 smsc911x: add dynamic bus configuration
3b1228a ASoC: Stop WM8903 SYSCLK when suspending
d58d5d5 ASoC: Convert WM8903 driver to register at I2C probe time
78e19a3 ASoC: Convert WM8900 to do more work at I2C probe time
f144b7f ALSA: cs5535 - Make OLPC-stuff depending on MGEODE_LX
0fb497f ALSA: cs5535audio: ensure MIC Bias/Analog Input bail if not on an
OLPC machine
b5ccc57 ALSA: cs5535audio: clean up OLPC code
c8f0eee ALSA: cs5535audio: turn off mic bias on OLPCs by default
01da024 ALSA: cs5535audio: for OLPC, default to Analog Input being off
bf1e527 ALSA: cs5535audio: rename V_REFOUT control to MIC Bias
e463ae1 ALSA: cs5535audio: enable OLPC's V_REFOUT bias when recording
189d34e ALSA: cs5535audio: check OLPC's Analog Input status vis GPIO
466ae3055 ALSA: cs5535audio: rename OLPC's analog input control && drop
AD1888's HPF
d6276b7 ALSA: cs5535audio: create function for setting OLPC's Analog Input
mode
1e2232b ALSA: cs5535audio: decouple HPF from V_REFOUT in OLPC code
b91254e ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff
3556d18 ALSA: cs5535audio: invert EAPD for OLPC (newer than B3)
c8974be ALSA: cs5535audio: Use OLPC/Geode basic infrastructure
57d4bf6 ALSA: cs5535audio: OLPC analog input support
b6c52a2 ALSA: cs5535audio: suspend/resume callbacks are only defined with
CONFIG_PM
b035ce0 ALSA: cs5535audio: turn off PCM properly if closing the audio device
0bed7b2 ALSA: cs5535audio: stick AD1888 bitshift values into a header file
0d0cf00 ASoC: Add codec registration API
cdc6936 ALSA: Add support for mechanical jack insertion
1e5fa31 ASoC: TWL4030: Change the name for the DACs
d4a7313 ASoC: TWL4030: Small cleanup
6a1bee4 ASoC: TWL4030: Add missing Carkit output
1e297a1 ASoC: Work around warnings from some build environments
11d518e ALSA: hda - Add quirk for HP6730B laptop
6fabd71 ixgbe: Implement PCIe AER support
5e8427e igb: Correctly determine pci-e function number in virtual environment
b4557be igb: update handling of RCTL for smaller buffer sizes
d2afbe7 ALSA: hda - Update documentation
44411e0 ALSA: ca0106 - Check return value of pci_enable_device() in resume
e97fd7c bonding: turn all bond_parm_tbls const
325dcf7 bonding: make tbl argument to bond_parse_parm() const
d787552 bonding: remove duplicate declarations
5a03cdb bonding: use pr_debug instead of own macros
ef65583 bonding: fix compile error if debug enabled
77afc92 bonding: use table for mode names
5840205 bonding: add and use bond_is_lb()
f73f2a6 ALSA: ASoC - Fix symbol conflicts in omac-mcbsp.c
acc4216 ALSA: sound: Make static
c9b3a40 ALSA: ASoC - Fix wrong section types
24e07db ALSA: ASoC - Fix module init entry for twl4030.c
512bb43 pkt_sched: sch_htb: Optimize WARN_ONs in htb_dequeue_tree() etc.
1b5c007 pkt_sched: sch_htb: Optimize htb_find_next_upper()
dbb7a95 phy: Add LSI ET1011C PHY driver
471716f ASoC: Fix typos in Atmel module registration
f075233 ASoC: Convert WM8900 to allow registration by machine code
6b05eda ASoC: Wait for non-AC97 codec DAIs before instantiating
435c5e2 ASoC: Initial framework for dynamic card instantiation
64089b8 ASoC: Register non-AC97 codec DAIs
958e792 ASoC: Register platform drivers
12a48a8 ASoC: Add platform registration API
3f4b783 ASoC: Register platform DAIs
9115171 ASoC: Add DAI registration API
c5af3a2 ASoC: Add card registration API
ca4513f ASoC: TWL4030: Do not alter the Headset output volume on power-up/down
df33980 ASoC: TWL4030: DAPM mapping of the Handsfree outputs
5152d8c ASoC: TWL4030: DAPM mapping of the Carkit outputs
dfad21a ASoC: TWL4030: DAPM mapping of the Headset outputs
2a6f5c5 ASoC: TWL4030: DAPM mapping of the PreDriv outputs
5e98a46 ASoC: TWL4030: DAPM mapping of the Earpiece output
e8ff9c4 ASoC: TWL4030: Add DAPM event handler for output MUX selection
44c5587 ASoC: TWL4030: Add Analog PGA control switch to DAPM
53b5047 ASoC: TWL4030: Correct DAPM_DAC with power control
1e64174 Audit: Log TIOCSTI
e19caae bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().
bcb09dc myri10ge: check fragmentation in LRO get_frag_header()
6cf1a0f bluetooth: Fix rfcomm_sock_ioctl() build failure with debugging
enabled.
e421300 hydra: fix compilation
30bc448 ALSA: Updates about bug-reporting in ALSA-Configuration.txt
94d6a5f user namespaces: document CFS behavior
e726f5f tracing/function-graph-tracer: fix 'flags' variable mismatch
efbe027 sched: idle_balance() does not call load_balance_newidle()
4217458 x86: signal: change type of paramter for sys_rt_sigreturn()
380c4b1 tracing/function-graph-tracer: append the tracing_graph_flag
8e1b82e tracing/function-graph-tracer: turn tracing_selftest_running into an
int
8b96f01 tracing/function-graph-tracer: introduce __notrace_funcgraph to
filter special functions
69b88af x86: clean up get_smp_config()
aa9c9b8 Merge branch 'linus' into x86/quirks
361b73d ring_buffer: fix comments
5436499 sched: fix sd_parent_degenerate on non-numa smp machine
4d117c5 Merge branch 'sched/urgent' into sched/core
3e1e900 x86: change static allocation of trampoline area
decbec3 tracing/function-graph-tracer: implement a print_headers function
5e03c54 ALSA: hrtimer - Use hard-irq callback
647808a ALSA: timer - Add comments and use ns_to_ktime()
6fdd34d dccp ccid-2: Phase out the use of boolean Ack Vector sysctl
4098dce dccp: Remove manual influence on NDP Count feature
0049bab dccp: Remove obsolete parts of the old CCID interface
63b8e28 dccp: Clean up old feature-negotiation infrastructure
991d927 dccp: Integration of dynamic feature activation - part 3 (client side)
192b27f dccp: Integration of dynamic feature activation - part 2 (server side)
6eb55d1 dccp: Integration of dynamic feature activation - part 1 (socket
setup)
b74ca3a netdevice: Kill netdev->priv
5a001a0 staging-winbond: Kill directly reference of netdev->priv
7657d90 user namespaces: require cap_set{ug}id for CLONE_NEWUSER
c37bbb0 user namespaces: let user_ns be cloned with fairsched
32e176c Sound: hda - Restore PCI configuration space with interrupts off
4bcd426 staging-slicoss: Kill directly reference of netdev->priv
979123d staging-p80211: Kill directly reference of netdev->priv
ad660e2 s390_net: Kill directly reference of netdev->priv
26aca5e net: Fix incorrect use of loose in spider_net.c
6c5cc8e wireless: Fix incorrect use of loose in wext.c
a2acde0 tcp: fix tso_should_defer in 64bit
d5dd917 tcp: use tcp_write_xmit also in tcp_push_one
730c30e Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
726e07a tcp: move some parts from tcp_write_xmit
41834b7 tcp: share code through function, not through copy-paste. :-)
ee6aac5 tcp: drop tcp_bound_rto, merge content of it tcp_set_rto
5013316 tcp: no need to pass prev skb around, reduces arg pressure
a1197f5 tcp: introduce struct tcp_sacktag_state to reduce arg pressure
775ffab tcp: make mtu probe failure to not break gso'ed skbs unnecessarily
9969ca5 tcp: Fix thinko making the not-shiftable to cover S|R as well
f0bc52f tcp: force mss equality with the next skb too.
61c1d05 dccp: use roundup instead of opencoding
d2b8881 tty: driverdata and discdata are void *
8a1ec21 tty: Flags should be accessed via the foo_bit interfaces
098401a Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
cb7b48f igb/e1000e: Naming interrupt vectors
1c72194 IB/ehca: Replace modulus operations in flush error completion path
3d08909 IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
1bf7724 IB/ipath: Fix spi_pioindex value
6114d4c IB/ipath: Only do 1X workaround on rev1 chips
60e8450 IB/ipath: Don't count IB symbol and link errors unless link is UP
890fccb IB/ipath: Check return value of dma_map_single()
fab01fc IB/ipath: Fix PSN of send WQEs after an RDMA read resend
6098d10 RDMA/nes: Cleanup warnings
1ee8655 RDMA/nes: Add loopback check to make_cm_node()
f3181a1 RDMA/nes: Check cqp_avail_reqs is empty after locking the list
abb7725 RDMA/nes: Fix TCP compliance test failures
4a14f6a RDMA/nes: Forward packets for a new connection with stale APBVT entry
183ecfa RDMA/nes: Avoid race between MPA request and reset event to rdma_cm
879e5bd RDMA/nes: Lock down connected_nodes list while processing it
c5d321e RDMA/nes: Cleanup cqp_request list usage
abf681c kbuild: remove TAR_IGNORE
28a1d86 ASoC: tlv320aic3x: control additions and cleanups
68fb740 ASoC: Add support for OMAP3 Pandora
c112d0c ath9k: Use GFP_ATOMIC when allocating TX private area
f8316df ath9k: Check for pci_map_single() errors
73a5267 rt2x00: Correctly initialize AID during set_key()
9c3444d rt2x00: Move crypto TX descriptor handling to rt2x00crypto.c
1c02667 rt2x00: Fix check for BSS info changes
4c7f0bc generic swap(): ath9k: rename swap() to swap_array()
74415ed rt2x00: Add RXDONE_CRYPTO_IV/ICV flags
011a033 iwl3945 : Fix a-band association for passive channels
a0987a8 iwlwifi: rely on API version read from firmware
c02b3ac iwlwifi: store ucode version number
f3f911d iwlwifi: fix DMA channel number in iwl_txq_ctx_stop
74221d0 iwl3945: Fix iwl3945 rate scaling.
c30e30e iwl3945: add debugfs support
d366df5 iwlwifi: move channels sysfs to debugfs
0ad91a3 iwlwifi: move disable/enable interrupts to iwl-core.c
c93007e iwl3945: Select correct sta ID from find_station()
99df630 iwlwifi: fix printk size format error
8f5c87d iwlwifi: move host command check function into separate file
304a698 rt2x00: Release rt2x00 2.2.3
dddfb47 rt2x00: Implement HW encryption (rt2500usb)
0b927a0 rt2x00: Remove duplicate code
42c8285 rt2x00: Store retry limit values
1ce9cda rt2x00: Optimize IV/EIV handling
aac9207 ath9k: Choose correct ANI calibration period
7470d7f iwlwifi: 5150 enable LO, TXIQ and BB calibrations
fd63edb iwlwifi: 5150 parametrize eeprom versions
339afc8 iwlwifi: 5150 compute ct kill threshold
819500c iwlwifi: 5150 enable DC calibration
7100e92 iwlwifi: 5150 add support for 5150
d97809d ath9k: Replace ath9k_opmode with nl80211_iftype
33fd819 iwlwifi: disable AP mode
c912765 p54: fix lm87 checksum endianness
0f70f39 cfg80211: "fix" 11d oops
c58f9f6 iwl3945: remove obsolete irq handling
8e7be8d mac80211: tx module cleanup.
4a4f4d8 cfg80211: fix wiphy remove if no regulatory request
8bef7a1 mac80211: document ieee80211_tx_info.pad
02e37ba p54: per-device names
b2023dd p54: refactoring
64c354d p54: include support for 2.13.24.0 USB LM87 Firmwares
25900ef p54: utilize cryptographic accelerator
c772a08 p54: revamp station power save management in access point mode
4571d3b mac80211: add sta_notify_ps callback
2a163c6 ath9k: Add a debugfs file for dumping DMA status
826d268 ath9k: Add initial layout for an ath9k specific debugfs mechanism
16d68ab ath9k: Remove includes that are not needed
88b126a ath9k: Add ATH9K_DEBUG configuration option
04bd463 ath9k: Use cleaner debug masks
d9a1f48 rtl8187: fix retry count passed in rtl8187_tx
007e5dd wireless: clean up radiotap a bit
e11602b ath9k: Handle channel initialization for AP mode
cb3da8c mac80211: accept empty strings for hidden SSIDs
e60c774 cfg80211: handle SIOCGIWMODE/SIOCSIWMODE
fee5267 cfg80211: handle SIOCGIWNAME
f650470 ath5k: enable combined michael mic in key cache
6714349 ath5k: clean up ath5k_hw_set_key
f6bac3e ath5k: preserve higher order bits when setting mac address
51e9bf5 iwlwifi: remove uses of __constant_{endian} helpers
10ec4f1 nl80211: relicense nl80211.h under the ISC
72bdcf3 nl80211: Add frequency configuration (including HT40)
72eaa43 mac80211: only transition STAs ps->wake on data frames
0d950d8 iwlwifi: properly initialize calibration command header
8e268e4 mac80211: disassociate prior to unlinking AP/station
e327b84 mac80211: deauth when interface is marked down
04adf89 hostap: select required crypto bits in Kconfig
21bbecd ftrace: use init_struct_pid as swapper pid
21a8c46 tracing/ftrace: provide the macro task_curr_ret_stack()
77d683f tracing/ftrace: fix the check of ftrace_trace_task
ff32504 tracing/ftrace: don't insert TRACE_PRINT during selftests
970987b Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and
'tracing/urgent' into tracing/core
a0286c9 x86: fix missing space in printk, #2
12dde4c ALSA: hda - Proper power-map toggling for input pins
55c395b x86: fix missing space in printk
e6e3ea2 ALSA: hda - Fix pin-detection in patch_sigmatel.c
e061b16 xfrm: Accept ESP packets regardless of UDP encapsulation mode
3f9b766 sgi-xp: Kill directly reference of netdev->priv
17c324f um: Kill directly reference of netdev->priv
6cbeba5 xtensa: Kill directly reference of netdev->priv
28945dd simeth: Kill directly reference of netdev->priv
5da9527 ALSA: ca0106 - Add power-management support
84d727a powerpc/4xx: Add support for ISA holes on 4xx PCI/X/E
9d2421e powerpc/44x: update ppc44x_defconfig
23f402c powerpc/kvm: update KVM config options in ppc44x_defconfig
32c8dab ASoC: Remove obsolete declaration of struct snd_soc_clock_info
affa219 x86: change thread_info's flag field back to 32 bits
c051556 Merge commit 'v2.6.28-rc7' into x86/cleanups
4e7c4d7 ALSA: hda - Add reference to HD-Audio.txt in ALSA-Configuration.txt
1fd8f2a tracing/function-graph-tracer: handle ftrace_printk entries
faec2ec ftrace: avoid duplicated function when writing set_graph_function
6b25393 tracing: fix typo and missing inline function
e32d895 ftrace: add ability to only trace swapper tasks
978f3a4 ftrace: use struct pid
5ef6476 pid: fix the do_each_pid_task() macro
804a685 ftrace: trace single pid for function graph tracer
0ef8cde ftrace: use task struct trace flag to filter on pid
ea4e2bc ftrace: graph of a single function
b29144c Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer'
into tracing/core
b8307db Merge commit 'v2.6.28-rc7' into tracing/core
4151d15 ALSA: hda - Add forgotten module alias for Nvidia MCP67 HDMI
e5f7343 ALSA: hda - Add MCP67 HDMI support
36cbac5 net/ipv6/ip6mr.c: Use kmem_cache_zalloc, remove memset
df66f85 if_usb: Kill directly reference of netdev->priv
4850218 smc91x: remove isa stuff from smc91x driver
999890b net: /proc/net/ip_mr_cache, display Iif as a signed short
1ea472e net: fix /proc/net/ip_mr_cache display - V2
9de6d99 netdev: remove pathetic compile-command lines
ec98ce4 Merge branch 'master' into next
8865c41 atm: 32-bit ioctl compatibility
dcd39c9 ne-h8300: convert to net_device_ops
5618f0d hydra: convert to net_device_ops
b611479 zorro8390: convert to net_device_ops
3e1d7cd e1000: e1000_adapter->polling_netdev is useless
a4d2f34 ixgbe: function comment typo
e4e6c38 jme: Remove 64 and 40 bit dma_mask
4f40bf4 jme: GHC register control fix for new hardware
59e4220 pkt_sched: sch_htb: Replace HTB_ACCNT() macro with inlines
23cb913 pkt_sched: sch_htb: Remove L2T()
244ef9b bond: Kill directly reference of netdev->priv
9734124 mptlan: Kill directly reference of netdev->priv
0eade1f dvb: Kill directly reference of netdev->priv
c19f7a3 pkt_sched: sch_htb: Clean htb_class prio and quantum fields
633fe66 pkt_sched: sch_htb: Remove htb_sched nwc_hit field
4164d66 pkt_sched: sch_htb: Remove htb_class aprio field
cb52deb forcedeth: power down phy when interface is down
a316084 drivers/net/smc911x.c: smc911x_drv_probe() cleanup
fd568fc drivers/isdn/mISDN: use ARRAY_SIZE
838361f isdn: Kill directly reference of netdev->priv
25dd7e6 hysdn: Kill directly reference of netdev->priv
5240488 Phonet: basic net namespace support
d81d228 xfrm: Accept XFRM_STATE_AF_UNSPEC SAs on IPv4/IPv6 only hosts
ff80aa9 setlocalversion: add git-svn support
167d6a0 setlocalversion: print correct subversion revision
846442c scripts: improve the decodecode script
c39dd50 scripts/package: allow custom options to rpm
5dae9a5 genksyms: allow to ignore symbol checksum changes
64e6c1e genksyms: track symbol checksum changes
a680eed tags and cscope support really belongs in a shell script
361425f powerpc/85xx: Create dts for each core in CAMP mode for MPC8572DS
f6682f9 kconfig: fix options to check-lxdialog.sh
3b1ec9f kbuild: gen_init_cpio expands shell variables in file names
efddd79 remove bashisms from scripts/extract-ikconfig
d230124 kbuild: teach mkmakfile to be silent
fd54f50 kbuild: use KECHO convenience echo
5410ecc kbuild: introduce $(kecho) convenience echo
d03fab4 kbuild: kill output in silent mode of mkcompile_h
d8672b4 kbuild: expand -I in KBUILD_CPPFLAGS
5b91c33 kbuild: fix -I option expansion with O=... builds
dc7d7b8 ASoC: Remove platform device from DAI suspend and resume operations
07c84d0 ASoC: Remove device from platform suspend and resume operations
384c89e ASoC: Push debugfs files out of the snd_soc_device structure
a7fe49b ALSA: Add more documentation about HD-audio driver
06be64a powerpc/85xx: Don't reset the MPIC for CAMP mode on MPC8572DS
c64ef80 powerpc/85xx: Add localbus node in mpc8572ds dts file
965dc5f powerpc/86xx: Basic GPIO support for GE Fanuc SBC610
09a3fba powerpc/qe: Move cmxgcr_lock definition from the ucc.c into the qe.c
d3a8cda powerpc/86xx: Add use of Epson RTX-8581 RTC to GE Fanuc SBC610 dts
24a9959 powerpc/85xx: Fix compile warnings in mpc85xx_mds.c
e8e1abe ftrace: fix race in function graph during fork
0a37119 trace: fix output of stack trace
0f62083 ALSA: Reduce stall detection timeout in riptide.c
d5b26db powerpc/85xx: Add support for SMP initialization
06b9096 powerpc/85xx: minor head_fsl_booke.S cleanup
b389889 powerpc: Better setup of boot page TLB entry
6a800f3 powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.
033b8a3 powerpc/math-emu: Remove redundant 'ret'
463a8c0 powerpc/math-emu: Adopt new version of _FP_CHOOSENAN
cf03033 powerpc/math-emu: Fix single float point division bug
55b9121 powerpc: Remove unncessary SPE related compiler flag
0640f84 Merge branch 'topic/hda-modularize' into topic/hda
6f2a974 ASoC: tlv320aic3x: headset/button press support
4b4fffd ASoC: Fix WM8903 right mixer bypass path
5920b45 ASoC: TWL4030: Add input selection and gain controls
7947cf0 hvc_console: Always schedule resize work on resize
3d26825 powerpc: Make open count variables signed in hvcs/hvsi/hvc_console
dc42149 drivers/hvc: Add missing of_node_put
b908b53 of/gpio: Implement of_get_gpio_flags()
2fd091f powerpc/macintosh: Fix unsigned check in smu_sat_get_sdb_partition()
e6a437e of/i2c: Fill the archdata for I2C devices
3f3b163 powerpc and sparc: Introduce dev_archdata node accessors
a0e2f9f powerpc/BSR: Support multiple OF-node description of BSR
6358d6c powerpc/ibmebus: Get rid of the IRQ mapping in ibmebus_free_irq()
786b32f powerpc: Eliminate NULL test and memset after alloc_bootmem
15e09c0 powerpc: Add sync_*_for_* to dma_ops
c4d04be powerpc: Allow the max stack trace depth to be configured
0186f47 powerpc: Use RCU based pte freeing mechanism for all powerpc
df3b861 powerpc: Add a local_flush_tlb_page to handle kmap_atomic invalidates
f4f3a12 powerpc: hash_page_sync should only be used on SMP & STD_MMU_32
4ee5f55 powerpc: Fix ppc32 mm_struct CPU tracking in SMP
1b98326 powerpc: Add MSR[CE, DE] to the MSR bits we print on show_regs()
764f3b9 tracing/function-graph-tracer: enabled by default
5274918 Merge branch 'merge'
29fa0b3 xfrm: Cleanup for unlink SPD entry
22d5532 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
166d3c7 tracing/function-graph-tracer: improve duration output
11e84ac tracing/function-graph-tracer: display unified style cmdline and pid
62679ef ftrace: add checks on ret stack in function graph
e49dc19 ftrace: function graph return for function entry
7ee991f ftrace: print real return in dumpstack for function graph
044fa78 ring-buffer: change "page" variable names to "bpage"
14a866c ftrace: add ftrace_graph_stop()
bb4304c ftrace: have function graph use mcount caller address
347fdd9 ftrace: clean up function graph asm
8789a9e ring-buffer: read page interface
abc9b56 ring-buffer: move some metadata into buffer page
a5e2588 ftrace: replace raw_local_irq_save with local_irq_save
dfdc543 Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
f0461d0 Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer'
into tracing/core
181de82 x86: remove dead BIO_VMERGE_BOUNDARY definition
6083aa4 Merge branch 'x86/io' into x86/iommu
3f8c6c9 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
aa2ba5f Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
6802454 Merge branch 'master' of
ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
ca17584 mac8390: update to net_device_ops
b9a9b4b etherh: build fix for net-next
dcb7731 x86: fix broken flushing in GART nofullflush path
87689d5 ASoC: Push platform registration down into the card
96841ba ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration
6308419 ASoC: Push workqueue data into snd_soc_card
39da581 virtio_net: large tx MTU support
8daa190 x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel
parameter
48d68b2 tracing/function-graph-tracer: support for x86-64
16950e0 ALSA: emu10k1 - Add capture boost mixer switch for Audigy
66eafeb function trace: fix a bug of single thread function trace
222658e Merge branches 'tracing/branch-tracer', 'tracing/ftrace',
'tracing/function-graph-tracer', 'tracing/markers', 'tracing/powerpc',
'tracing/stack-tracer' and 'tracing/tracepoints' into tracing/core
74bf3ca Merge branch 'tracing/urgent' into tracing/core
6976a1d net: percpu_counter_inc() should not be called in BH-disabled section
422d9cd dccp: Feature activation handlers
b1ad004 dccp: Processing Confirm options
e77b836 dccp: Process incoming Change feature-negotiation options
75757a7 dccp: Preference list reconciliation
8b7b6c7 dccp: Integrate feature-negotiation insertion code
0971d17 dccp: Insert feature-negotiation options into skb
7c37d74 IB/ipath: Improve UD loopback performance by allocating temp array
only once
64f22fa IB/ipath: Fix pointer-to-pointer thinko in ipath_fs.c
75c21ae IB/ehca: Fix locking for shca_list_lock
0ecfe79 ASoC: Don't free static data in WM9713
4290239 ASoC: TWL4030: Add volume controls for outputs
d889a72 ASoC: TWL4030: Change the common playback volume controls
381a22b ASoC: TWL4030: Change the capture volume control to TLV
fa5c769 ASoC: Remove in-code changelog from AD73311 driver
7d8c16a ASoC: Annotate core removal function
968a602 ASoC: Rename snd_soc_register_card() to snd_soc_init_card()
6c415b9 sched: add uid information to sched_debug for CONFIG_USER_SCHED
50cec5c x86: fix dma_mapping_error for 32bit x86, cleanup
f6d2e6f Merge branch 'x86/urgent' into x86/iommu
682d587 ALSA: ASoC: Fix old-style trigger callback in s3c2443-ac97.c
5220ed6 ALSA: ASoC: Fix compile warnings on corgi.c
0bc286e Revert "ALSA: soc - Fix compile warnings in wm8903.c"
2caf6a1 ALSA: ASoC: Remove superfluous dependency on SND_SOC
3af4182 Merge branch 'upstream' into topic/asoc
f5d4c67 ALSA: soc - Remove obsoleted sound/driver.h inclusion
1966bbd ALSA: ac97 - Add WM9715 to AC97 IDs
9171e5e ALSA: soc - Fix compile warnings in wm8903.c
ade9b2f ALSA: pcxhr - change firmware filenames
480cf66 ALSA: Fix a compile warning in cs46xx_lib.c
8c2f767 ALSA: hda - Remove unnecessary caches for power states in
patch_sigmatel.c
c9b46f9 ALSA: hda - Use amp cache for SPDIF mute controls in patch_sigmatel.c
9a5df92 Bluetooth: Fix RFCOMM release oops when device is still in use
2e79299 Bluetooth: Fix format arguments warning
a418b89 Bluetooth: Enable per-module dynamic debug messages
5ddd4a6 Bluetooth: Allow SCO audio with Asus WL-BTD202 dongle
7a9d402 Bluetooth: Send HCI Reset command by default on device initialization
12421b4 Bluetooth: Remove deprecated hci_usb driver
7b99d17 Bluetooth: Respect HCI_UART_DEBUG config in hci_ll.c
51a6fbc Bluetooth: Change simple_strtol to simple_strtoul
db7aa1c Bluetooth: Fix warnings for bt_key_strings and bt_slock_key_strings
c6bf514 Bluetooth: Fix leak of uninitialized data to userspace
7644d63 Bluetooth: Fix TX error path in btsdio driver
6a88adf Bluetooth: Add suspend/resume support to btusb driver
a780efa Bluetooth: Handle bulk URBs in btusb driver from notify callback
2eda66f Bluetooth: Add fine grained mem_flags usage to btusb driver
93093d0 x86: provide readq()/writeq() on 32-bit too, complete
a0b1131 x86: provide readq()/writeq() on 32-bit too, cleanup
2c5643b x86: provide readq()/writeq() on 32-bit too
4385cec x86: intel_cacheinfo, minor show_type cleanup
25f1304 gigaset: get rid of info() and warn() macros
af4218c gigaset: remove unnecessary poll method
f08340c tracepoints: Documentation TPPROTO misspelt in
Documentation/tracepoints.txt
65c6dc6 tracing/branch-tracer: include missing irqflags.h
c5419e6 cxgb3: Fix sparse warning and micro-optimize is_pure_response()
f95be180 phy: add the ST ste10Xp PHYs
4621bf1 phy: Add file missed in previous commit.
0f0ca34 phy: power management support
914804b phy: add natsemi PHY driver
65a467f ne2: silence static never defined warnings
d8e8034 bnx2: use net_device_stats nowadays available in net_device
9fd4287 niu: use net_device_stats nowadays available in net_device
70574a9 sched: move double_unlock_balance() higher
f1860c3 Merge branch 'sched/urgent' into sched/core
604094f vfs, seqfile: export mangle_path() generally
a838c2e markers: comment marker_synchronize_unregister() on data dependency
02834f1 ALSA: ac97 - Remove EXPERIMENTAL from CONFIG_SND_AC97_POWER_SAVE
36adba1 ALSA: hda - Remove EXPERIMENTAL from CONFIG_SND_HDA_POWER_SAVE
8caac56 aperture_64.c: clarify that too small aperture is valid reason for
this code
ff7a326 ALSA: hda - Don't export symbols when built-in kernel
645f10c ALSA: hda - Check MODULE instead of CONFIG_SND_HDA_INTEL_MODULE
5b3eec0 x86: ret_from_fork - get rid of jump back
3bdae4f Merge branch 'x86/debug' into x86/irq
9f1e87e x86: entry_64.S - trivial: space, comments fixup
de04b10 ALSA: oxygen: add Claro halo support
57a5ef4 ALSA: hda - Add quirk for Sony VAIO VGN-SR19XN
56d1771 ALSA: hda - Clear codec->proc_widget_hook at reset
2d34e1b ALSA: hda - Add IDT/STAC-specific proc output
5ae3a13 x86: uv bau interrupt -- use proper interrupt number
f1eecf0 powerpc/ppc32: static ftrace fixes for PPC32
0029ff8 powerpc: ftrace, use create_branch
ec682ce powerpc: ftrace, added missing icache flush
d9af12b powerpc: ftrace, fix cast aliasing and add code verification
c7b0d17 powerpc: ftrace, do nothing in mcount call for dyn ftrace
c072c24 ftrace: improve documentation
1d9b16d x86: move GART specific stuff from iommu.h to gart.h
bb40abe ALSA: hda - Remove unused proc entry in hda_bus struct
daead53 ALSA: hda - Add codec-specific proc hook
50cdaf0 ftrace: improve seq_operation of ftrace
6113b74 pkt_sched: fix sparse warning
ea5693c netlink: allow empty nested attributes
c7425ac tracing, alpha: fix build: add missing #ifdef CONFIG_STACKTRACE
ed77a89 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
d51090b tracing/function-graph-tracer: more output tweaks
1a05615 tracing/function-graph-tracer: adjustments of the trace informations
475ad8e decnet: compile fix for removal of byteorder wrapper
11cd41b ALSA: hda - Fix build error with CONFIG_SND_HDA_POWER_SAVE
feea6a5 ixgbe: section fixes
157653c sctp: fix missing label when PROC_FS=n
1289e9e ALSA: hda - Modularize HD-audio driver
73f6a12 ALSA: sound/pci/mixart/mixart.c: Add missing snd_card_free
30d72e9 ALSA: hda - Fix creation of automatic capture mixers
529bd6c ALSA: hda - Fix PCM reconfigure
c2c631e x86: entry_64.S - use ENTRY to define child_rip
3345453 x86: entry_64.S - use X86_EFLAGS_IF instead of hardcoded number
fee2fba ALSA: hda - Move power_save option to hda_intel.c
986862b ALSA: hda - make some functions static
d211af0 i386: get rid of the use of KPROBE_ENTRY / KPROBE_END
ddeb8f2 x86_64: get rid of the use of KPROBE_ENTRY / KPROBE_END
83a8df6 tracing/function-graph-tracer: enhancements for the trace output
c7cc773 Merge branches 'tracing/blktrace', 'tracing/ftrace',
'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core
40a914f igb: Add support for pci-e Advanced Error Reporting
f411303 e100: cleanup link up/down messages
d276016 ixgb: cleanup link up/down messages
b30c4d8 e1000: cleanup link up/down messages
a46e534 ixgbe: cleanup link up/down messages
527d47c igb: link up/down messages must follow a specific format
c4106aa decnet: remove private wrappers of endian helpers
5b9ab2e Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
12666f0 ALSA: snd-usb-caiaq: clean up the control adding code
851fd7b cxgb3: Update FW loading path.
ad58633 cxgb3: integrate FW and protocol engines in the kernel
5256554 cxgb3: avoid potential memory leak.
43a944f cxgb3: set hard_xmit in the netdev_ops
b5ddedc Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
244e6c2 pkt_sched: gen_estimator: Optimize gen_estimator_active()
54f0191 ASoC: Allow more routing features for tlv320aic3x
b235507 mac80211_hwsim: fix-up some print_mac merge damage
860c6e6 mac80211: fix unaligned access in ieee80211_wep_encrypt_data
b50563a p54: fix wmm queue settings
99405f9 ath9k: Use proper TX channel width for setting channels
ff37e33 ath9k: Code scrub
bf8c1ac nl80211: Change max TX power to be in mBm instead of dBm
39d1ffe orinoco: Provide option to avoid unnecessary fw caching
ac7cafd orinoco: Resume spectrum_cs in the same way as orinoco_cs
2cea7b2 orinoco: Cache Symbol firmware
7473431 orinoco: Separate fw caching from download
cb71d9b ath9k: Handle -ENOMEM on RX gracefully
24689c8 rfkill: always call get_state() hook on resume
f80b5e9 rfkill: preserve state across suspend
5925d97 mac80211: Look out for some other AP when disassoc is received.
e2f367f nl80211: Report max TX power in NL80211_BAND_ATTR_FREQS
1048643 ath5k: Clean up eeprom parsing and add missing calibration data
7ac4701 ath9k: Dont update rate control for every AMPDU
40fc95d iwlwifi: TX update chicken bits
31a73fe iwlwifi: TX setup fix confusion between TX queue and TX DMA channel
25e35a5 iwlwifi: 4965 define firmware file name once
201706a iwlwifi: enable base band calibration in 5000 HW
83dde8c iwlwifi: move iwl_clear_stations_table to iwl-sta.c
ce546fd iwl3945 : Fix ad-hoc mode for 3945
0e149cf ath5k: set mac address in add_interface
8f93b8b ath9k: Use straightforward PCI routines to setup the TX buffer.
daa9deb ath9k: Update TX trigger level on a FIFO underrun.
788a3d6 ath9k: Fix bug in deciphering channel flags
c428839 ath9k: Move TX completion routine to xmit.c
2c5a744 ath9k: Use helpers
46d14a5 ath9k: General code scrub
e63835b ath9k: Remove ath9k_rate_table
a8efee4 ath9k: Use rate_driver_data
fe7f4a7 ath9k: Remove ath_rate_softc
5ddfac3 ath9k: Remove rate control reference in VAP
ffd651c ath9k: We don't support non-HT devices, so remove superfluous code.
be0418a ath9k: Revamp RX handling
2b406f1 ath9k: Nuke fixed rate handling in driver
46494e6 ath9k: Remove half/quarter rate tables
4df8ec6 ath9k: Remove ath_rate_newassoc()
7b4d273 ath9k: Remove ath_setup_rates
fe60594 ath9k: Simplify RC alloc/free functions
256b775 ath9k: Merge struct ath_tx_ratectrl with ath_rate_node
3fcdfb4 ath9k: Fix panic while unregistering rfkill
1548c86 rtl8187: Fix transmission count sent to mac80211
1dc5a84 mac80211: Fix pid rate-setting algorithm to allow rate changes
d507748 rt2x00: Don't switch off LED on initialization
f941f85 orinoco: indicate it is using dBm in wireless_stats and spy
8eb41c9 mac80211: make Minstrel the default rate control algorithm
eea0579 ALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCK
e7dd8c1 Merge branch 'topic/misc' into topic/pcsp-fix
0bfc245 blktrace: port to tracepoints, update
5f3ea37 blktrace: port to tracepoints
414ff49 ASoC: Fix word wrapping in OMAP Kconfig
3d4cd60 smc-mca: Fix build failure due to typo.
7035560 net: release skb->dst in sock_queue_rcv_skb()
4db646b x86: microcode: fix sparse warnings
f3f47a6 tracing: add "power-tracer": C/P state tracer to help power
optimization
4f19962 ALSA: sound/pci/hda/hda_codec.c: cleanup kernel-doc
437f24f ftrace: add cpu annotation for function graph tracer
660c7f9 ftrace: add thread comm to function graph tracer
e53a631 ftrace: let function tracing and function return run together
5a45cfe ftrace: use code patching for ftrace graph tracer
df4fc31 ftrace: add function tracing to single thread
3496f92 Merge branch 'serge-next' into next
dd24c00 net: Use a percpu_counter for orphan_count
1748376 net: Use a percpu_counter for sockets_allocated
c1b5687 tc: policing requires a rate estimator
71bcb09 tc: check for errors in gen_rate_estimator creation
0e991ec tc: propogate errors from tcf_hash_create
5ceb40d x86: signal: unify signal_{32|64}.c
e5fa2d0 x86: signal: unify signal_{32|64}.c, prepare
bfeb91a x86: signal: cosmetic unification of __setup_sigframe() and
__setup_rt_sigframe()
2601657 x86: signal: move {setup|restore}_sigcontext()
d144d5e ftrace: adding other non-leaving .text sections
4ef8e76 ne2000: convert to net_device_ops
53cdd28 3c503: convert to net_device_ops
e0b8cb0 stnic: convert to net_device_ops
7d359da apne: convert to net_device_ops
50014f1 ne2: convert to net_device_ops
4be7ef4 hp: convert to net_device_ops
0ec4d4f lne390: convert to net_device_ops
8284abe e2100: convert to net_device_ops
9a9aa14 es3210: convert to net_device_ops
d269941 ne3210: convert to net_device_ops
d079841 smc: convert to net_device_ops
d4a97d4 hp-plus: convert to net_device_ops
458228b wd: use net_device_ops
8884c09 8390: add common net_device ops
c2324b6 tracing: function graph tracer, fix
b27aead netns xfrm: per-netns sysctls
c68cd1a netns xfrm: /proc/net/xfrm_stat in netns
59c9940 netns xfrm: per-netns MIBs
4fb236b netns xfrm: AH/ESP in netns!
7013ec3 netns PF_KEY: per-netns /proc/pfkey
07fb0f1 netns PF_KEY: part 2
3fa87a3 netns PF_KEY: part 1
7c2776e netns xfrm: flush SA/SPDs on netns stop
fbda33b netns xfrm: ->get_saddr in netns
c5b3cf4 netns xfrm: ->dst_lookup in netns
db983c1 netns xfrm: KM reporting in netns
7067802 netns xfrm: pass netns with KM notifications
fc34acd netns xfrm: xfrm_user module in netns
a6483b7 netns xfrm: per-netns NETLINK_XFRM socket
bd235e3 netns xfrm: xfrm_input() fixup
ddcfd79 netns xfrm: dst garbage-collecting in netns
3dd0b49 netns xfrm: flushing/pruning bundles in netns
99a6665 netns xfrm: xfrm_route_forward() in netns
f6e1e25 netns xfrm: xfrm_policy_check in netns
52479b6 netns xfrm: lookup in netns
cdcbca7 netns xfrm: policy walking in netns
8d1211a netns xfrm: finding policy in netns
33ffbbd netns xfrm: policy flushing in netns
1121994 netns xfrm: policy insertion in netns
e92303f netns xfrm: propagate netns into policy byidx hash
284fa7d netns xfrm: state walking in netns
5447c5e netns xfrm: finding states in netns
12604d8 netns xfrm: fixup xfrm_alloc_spi()
221df1e netns xfrm: state lookup in netns
0e60245 netns xfrm: state flush in netns
98806f7 netns xfrm: trivial netns propagations
64d0cd0 netns xfrm: propagate netns into bydst/bysrc/byspi hash functions
66caf62 netns xfrm: per-netns policy hash resizing work
dc2caba netns xfrm: per-netns policy counts
a35f6c5 netns xfrm: per-netns xfrm_policy_bydst hash
8b18f8e netns xfrm: per-netns inexact policies
8100bea netns xfrm: per-netns xfrm_policy_byidx hashmask
93b851c netns xfrm: per-netns xfrm_policy_byidx hash
adfcf0b netns xfrm: per-netns policy list
0331b1f netns xfrm: add struct xfrm_policy::xp_net
50a3065 netns xfrm: per-netns km_waitq
c783714 netns xfrm: per-netns state GC work
b8a0ae2 netns xfrm: per-netns state GC list
6308273 netns xfrm: per-netns xfrm_hash_work
0bf7c5b netns xfrm: per-netns xfrm_state counts
529983e netns xfrm: per-netns xfrm_state_hmask
b754a4f netns xfrm: per-netns xfrm_state_byspi hash
d320bbb netns xfrm: per-netns xfrm_state_bysrc hash
73d189d netns xfrm: per-netns xfrm_state_bydst hash
9d4139c netns xfrm: per-netns xfrm_state_all list
673c09b netns xfrm: add struct xfrm_state::xs_net
d62ddc2 netns xfrm: add netns boilerplate
c958396 xfrm: initialise xfrm_policy_gc_work statically
46a8494 3c523: fix warning in drivers/net/3c523.c
99da1a8 depca: fix warning in drivers/net/depca.c
a098397 atlx: fix warning in drivers/net/atlx/atl2.c
287b6e6 tracing/function-return-tracer: set a more human readable output
fb52607 tracing/function-return-tracer: change the name into
function-graph-tracer
45555c0 bluetooth: fix warning in net/bluetooth/rfcomm/sock.c
ff0db04 sunrpc: fix warning in net/sunrpc/xprtrdma/verbs.c
e14bec2 ax25: fix warning in net/ax25/sysctl_net_ax25.c
509dcee Merge branches 'tracing/hw-branch-tracing' and
'tracing/branch-tracer' into tracing/core
e6a1762 mlx4: fix warning in drivers/net/mlx4/mcg.c
3ed7cc0 dccp: fix warning in net/dccp/options.c
b71e839 cassini: fix warning in drivers/net/cassini.c
b58515b mlx4: fix error path in drivers/net/mlx4/en_rx.c
4174439 z85230: fix warning in drivers/net/wan/z85230.c
ef0cd87 sis900: fix warning in drivers/net/sis900.c
180b65d fix warning in fs/dlm/netlink.c
d3f644d dsa: fix warning in net/dsa/mv88e6060.c
2a9e797 dsa: fix warning in net/dsa/mv88e6xxx.c
55205d4 ipv6: fix warning in net/ipv6/ip6_flowlabel.c
dc0a001 pkt_sched: fix warning in net/sched/sch_hfsc.c
ed72b9c sunrpc: fix warning in net/sunrpc/xprtrdma/svc_rdma_transport.c
be5a3c6 qla3xxx: fix warning in drivers/net/qla3xxx.c
f166400 niu: fix another warning in drivers/net/niu.c
51e0f05 niu: fix warnings in drivers/net/niu.c
2e6a684 s2io: fix warning in drivers/net/s2io.c
09bb521 netns: filter out uevent not belonging to init_net
cb13fc2 ixgbe: Naming interrupt vectors
70340d7 niu: Naming interrupt vectors.
9f782db tcp: skb_shift cannot cache frag ptrs past pskb_expand_head
f6486d4 pkt_sched: sch_api: Remove qdisc_list_lock
723b461 net: udp_unhash() can test if sk is hashed
5bc0b3b net: Make sure BHs are disabled in sock_prot_inuse_add()
8eecaba tcp: tcp_limit_reno_sacked can become static
4ada424 mac80211: don't assume driver has been attached on registration
4d3601b ath9k: Configure AR_PHY_SWITCH_COM with apropriate antenna control
ced0957 p54: honour bss_info_changed's basic_rates and other settings
40db0b2 p54pci: cache firmware for suspend/resume
ffed785 p54: minor fixes
d131bb5 p54: enable Mesh Point support
f16f33d mac80211: Use the HT capabilities from the IE instead of the
station's caps.
97b777d ath9k: make DMA memory consistent
1d450cf ath9k: Clarify we only want 32-bit DMA
f1ca216 rt2x00: Detect USB BULK in/out endpoints
c8f9697 rtl8187: Remove module warning and dependence on CONFIG_EXPERIMENTAL
3517afd rtl8187: feedback transmitted packets using tx close descriptor for
8187B
b4572a9 rtl8187: implement conf_tx callback to configure tx queues
54ac218 rtl8187: fix 8187B throughput regression
db93e7b ath9k: Race condition in accessing TX and RX buffers.
306efdd ath9k: IRQ should be disabled before calling free_irq()
e97275c ath9k: Build RFKILL feature even when RFKILL subsystem is a MODULE
f9bbf43 ath9k: incorrect noise floor threshold values.
9f80420 ath9k: INI update for atheros chipets.
ea4a82d iwlwifi: enable custom fw regulatory solution
14b9815 cfg80211: add support for custom firmware regulatory solutions
3f2355c cfg80211/mac80211: Add 802.11d support
88dc1c3 cfg80211: mark regdomains with > NL80211_MAX_SUPP_REG_RULES invalid
02ba0b3 cfg80211: call_crda() won't tell us if CRDA was present
a01ddaf cfg80211: expect different rd in cfg80211 when intersecting
b8295ac cfg80211: separate intersection section in __set_regdom()
8375af3 cfg80211: remove switch from __set_regdom()
5203cdb cfg80211: remove switch from __regulatory_hint()
91e9900 cfg80211: mark negative frequencies as invalid
e0737a7 iwlwifi: iwl-fh.h cleanup
34faf78 iwlwifi: some fh document fix and cleanup
352bc8d iwlwifi: configure_filter rewrite
c305606 iwlwifi : fix checkpatch.pl errors
dbce56a iwlwifi: replace magic constants with define
417f114 iwlwifi: rs: remove fc variable and other cleanups
9f58671 iwlwifi: consolidate station management code
cee53dd iwl3945 : Simplify iwl3945_pci_probe
0e3de99 rt2x00: Fix TX failure path
0f829b1 rt2x00: Move rt73usb register access wrappers into rt2x00usb
c9c3b1a rt2x00: Cleanup indirect register access
9764f3f ath5k: name pci driver "ath5k" too
d6e8cc6 netfilter: fix warning in net/netfilter/nf_conntrack_ftp.c
65f233f netfilter: fix warning in net/netfilter/nf_conntrack_proto_tcp.c
1e9b51c x86, bts, ftrace: a BTS ftrace plug-in prototype
8bba1bf x86, ftrace: call trace->open() before stopping tracing; add
trace->print_header()
6abb11a x86, bts, ptrace: move BTS buffer allocation from ds.c into ptrace.c
ca0002a x86, bts: base in-kernel ds interface on handles
7d55718 Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into
tracing/hw-branch-tracing
9e0f1b7 ASoC: Clean up kernel-doc for snd_soc_dai_set_fmt
5c0d7bb ASoC: tosa: move gpio probing to machine callbacks
4451582 ASoC: Add support for TI SDP3430
9c8f1a0 ASoC: Fix TWL4030 Kconfig dependency
375e8a7 ASoC: OMAP: Add support for mono audio links in McBSP DAI
0be4305 ASoC: OMAP: Apply channel constrains to N810 machine driver
b0e6481 ALSA: hda - Really fix bits value in proc output
eefe93b Merge branch 'topic/fix/hda' into topic/hda
ee09543 ALSA: hda - Add quirk for MSI 7260 mobo
c0193f3 ALSA: pcxhr - add support for pcxhr stereo sound cards (mixer part)
2f9889a Revert "hso: Fix crashes on close."
ab153d8 Revert "hso: Fix free of mutexes still in use."
cd90ee1 Revert "hso: Add TIOCM ioctl handling."
7628700 ALSA: pcxhr - add support for pcxhr stereo sound cards (firmware
support)
9d948d2 ALSA: pcxhr - add support for pcxhr stereo sound cards (core change)
93bf5d8 ALSA: pcxhr - add support for pcxhr stereo sound cards
9f40ac7 netfilter: nfmark IPV6 routing in OUTPUT, mangle, NFQUEUE
5f145e4 netfilter: nfmark routing in OUTPUT, mangle, NFQUEUE
c6e4c66 ALSA: hda - Assign unsol tags dynamically in patch_sigmatel.c
0e19e7d Merge branch 'topic/fix/hda' into topic/hda
82894b6 ALSA: hda - Fix proc pcm rate bits
fb7e067 xfrm: remove useless forward declarations
6daad37 ah4/ah6: remove useless NULL assignments
69d728b igb: loopback bits not correctly cleared from RCTL register
9b07f3d igb: remove unneeded bit refrence when enabling jumbo frames
7a6b6f5 DCB: fix kconfig option
411c41e aoe: remove private mac address format function
9c8f92a hso: Hook up ->reset_resume
7ea3a9a hso: Add TIOCM ioctl handling.
52429eb hso: Fix free of mutexes still in use.
89930b7 hso: Fix URB submission -EINVAL.
4a3e818 hso: Fix crashes on close.
bab04c3 hso: Add new usb device id's.
47fd5b8 netdev: add HAVE_NET_DEVICE_OPS
e951e4a x86: fix unused variable warning in arch/x86/kernel/hpet.c
14bfc98 tracing, tty: fix warnings caused by branch tracing and tty_kref_get()
0ace285 tcp: handle shift/merge of cloned skbs too
111cc8b tcp: add some mibs to track collapsing
92ee76b tcp: Make shifting not clear the hints
832d11c tcp: Try to restore large SKBs while SACK processing
f58b22f tcp: make tcp_sacktag_one able to handle partial skb too
adb92db tcp: Make SACK code to split only at mss boundaries
e8bae27 tcp: more aggressive skipping
e1aa680 tcp: move tcp_simple_retransmit to tcp_input
4a17fc3 tcp: collapse more than two on retransmission
200036c CRED: fix sparse warnings
a21bba9 net: avoid a pair of dst_hold()/dst_release() in
ip_push_pending_frames()
6ded6ab User namespaces: use the current_user_ns() macro
18b6e04 User namespaces: set of cleanups (v2)
2e77d89 net: avoid a pair of dst_hold()/dst_release() in ip_append_data()
4db0acf net: gen_estimator: Fix gen_kill_estimator() lookups
3f0947c pkt_sched: sch_drr: fix drr_dequeue loop()
4b40eed infiniband: Kill directly reference of netdev->priv
486bf8d netdevice sbni: Convert directly reference of netdev->priv
5c94afd tokenring/3c359.c: Prevent possible mem leak when open failed
138a5cd tokenring/3c359.c: Fix error message when allocating tx_ring
d0cc10a tokenring/3c359.c: fix allocation null check
85920d4 8139too: use err.h macros
3755810 net: Make sure BHs are disabled in sock_prot_inuse_add()
fde22f2 ASoC: Lower priority of resume work logging
67c9151 ASoC: Flag AD1980 as an AC97 interface
3ba9e10 ASoC: Remove DAI type information
4813ead netfilter: nf_conntrack_ftp: change "partial ..." message to
pr_debug()
6f893fb Merge branches 'tracing/branch-tracer', 'tracing/fastboot',
'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/power-tracer',
'tracing/powerpc', 'tracing/ring-buffer', 'tracing/stack-tracer' and
'tracing/urgent' into tracing/core
64b7482 Merge branch 'sched/rt' into sched/core
ef1681d ALSA: hda - Add probe_mask quirk for Medion MD96630
b0bd53a ASoC: TWL4030: Add helper function for output gain controls
0d33ea0 ASoC: TWL4030: Add CGAIN volume control
c10b82c ASoC: TWL4030: Change the Master volume control to TLV
f8d05bd ASoC: TWL4030: Disable soft-volume
55b8bac ASoC: Use supplied DAI for WM9713 rather than substream
328bd89 netfilter: nf_conntrack_proto_sctp: avoid bogus warning
ad07e91 x86 defconfig: increase CONFIG_LOG_BUF_SHIFT
b47b928 x86: drop REBOOT_CF9_COND from reboot fallback chain
920de80 net: Make sure BHs are disabled in sock_prot_inuse_add()
1f87e23 eth: Declare an optimized compare_ether_addr_64bits() function
ef8ef5f ALSA: hda: Added an ALC888 model entry for Fujitsu-Siemens Amilo
Xa3530
a9cb5c9 ALSA: hda - No 'Headphone as Line-out' swich without line-outs
70eb1bf axnet_cs: Fix build after net device ops ne2k conversion.
6f756a8 net: Make sure BHs are disabled in sock_prot_inuse_add()
be77e59 net: fix tunnels in netns after ndo_ changes
c25eb3b net: Convert TCP/DCCP listening hash tables to use RCU
8c862c2 dccp: Header option insertion routine for feature-negotiation
d371056 dccp: Support for Mandatory options
02fa460 dccp: Increase the scope of variable-length htonl/ntohl functions
71c262a dccp: API to query the current TX/RX CCID
b20a9c2 dccp: Set per-connection CCIDs via socket options
2c62ad7 myri10ge: update firmware headers
4ee2ac5 myri10ge: update DCA comments
c1fd3b9 net: af_netlink should update its inuse counter
04f258c net: some optimizations in af_inet
958086d vfs, seqfile: fix comment style on mangle_path
65afa5e tracing/function-return-tracer: free the return stack on free_task()
3b71e9e x86: HPET: fix sparse warning
5f5db59 x86, debug: remove the confusing entry in call trace
a1a00b5 x86: boot - fix sparse warnings
3b6c52b x86: introduce ENTRY(KPROBE_ENTRY)_X86 assembly helpers to catch
unbalanced declaration v3
eae849c tracing/function-return-tracer: don't trace kfree while it frees the
return stack
6efdcfa x86: KPROBE_ENTRY should be paired wth KPROBE_END
322648d x86: include ENTRY/END in entry handlers in entry_64.S
813b852 Merge branch 'ppc/ftrace' of
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into
tracing/powerpc
050dc69 x86: remove duplicate #define from 'cpufeature.h'
8a2503f x86: move dwarf2 related macro to dwarf2.h
e38da59 tracing/stack-tracer: avoid races accessing file
8d26487 tracing/stack-tracer: introduce CONFIG_USER_STACKTRACE_SUPPORT
cffa10a tracing/stack-tracer: fix locking and refcounts
8d7c6a9 tracing/stack-tracer: fix style issues
0429149 trace: fix compiler warning in branch profiler
69bb54e ftrace: add ftrace_off_permanent
033601a ring-buffer: add tracing_off_permanent
e58918a ftrace: scripts/recordmcount.pl support for ARM
3a3d04a ftrace: specify $alignment for sh architecture
2bcd521 trace: profile all if conditionals
bac28bf trace: branch profiling should not print percent without data
45b7974 trace: consolidate unlikely and likely profiler
42f565e trace: remove extra assign in branch check
c204f72 ftrace: create default variables for archs in recordmcount.pl
42e007d ftrace: add support for powerpc to recordmcount.pl script
0da85c0 sh: dynamic ftrace support.
4e42ebd x86: hypervisor - fix sparse warnings
1d926f2 init/main.c: use ktime accessor function in initcall_debug code
c450d78 x86: vmware - fix sparse warnings
2456d73 x86: signal: cosmetic unification of sys_rt_sigreturn()
666ac7b x86: signal: cosmetic unification of sys_sigaltstack()
5c9b3a0 x86: signal: cosmetic unification of including headers
cbe2f5a tracing: allow tracing of suspend/resume & hibernation code again
b54d3de tracing: identify which executable object the userspace address
belongs to
74e2f33 vfs, seqfile: make mangle_path() global
02b6751 tracing: add support for userspace stacktraces in tracing/iter_ctrl
82f60f0 tracing/function-return-tracer: clean up task start/exit callbacks
f201ae2 tracing/function-return-tracer: store return stack into task_struct
and allocate it dynamically
a0a70c7 Merge branches 'tracing/profiling', 'tracing/options' and
'tracing/urgent' into tracing/core
f377fa1 x86: clean up stack overflow debug check
3aeb95d x86_64: fix the check in stack_overflow_check
ca9eed7 Merge commit 'v2.6.28-rc6' into x86/debug
3889d0c x86: revert default reboot method to REBOOT_KBD
4805286 ALSA: hda - fix build warning when CONFIG_PROC_FS=n
9415e1c ALSA: hda - fix DisplayPort naming
a5fcf89 ALSA: hda - document the ELD proc interface
acb0599 ALSA: hda - ELD proc interface write updates
03284c8 ALSA: hda - make HDMI messages more user friendly
cc02b83 ALSA: hda - report selected CA index for Audio InfoFrame
b83923a ALSA: hda - minor HDMI code cleanups
c810841 x86: split out some macro's and move common code to paranoid_exit, fix
c46920d Merge branch 'for-david' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
f5f4cf0 igb: do not use phy ops in ethtool test cleanup for non-copper parts
21fc578 enic: misc cleanup items:
8459645 enic: move wmb closer to where needed: before writing posted_index to
hw
cb3c766 enic: mask off some reserved bits in CQ descriptor for future use
27372bf enic: driver/firmware API updates
86ca9db enic: enable ethtool LRO support
6476a90 WAN pc300too.c: Fix PC300-X.21 detection
7236470 WAN: syncppp.c is no longer used by any kernel code. Remove it.
e022c2f WAN: new synchronous PPP implementation for generic HDLC.
e1f024e WAN: Simplify sca_init_port() in HD64572 driver.
fcfe9ff WAN: Correct comments in hd6457[02].c
0b59cef WAN: HD64572 drivers don't use next_desc() anymore.
61e0a6a WAN: Simplify HD64572 drivers.
9678343 WAN: don't print HD64572 driver versions anymore.
0954ed8 WAN: Simplify HD64572 status handling.
0446c3b WAN: rework HD64572 interrupts a bit.
b0942f7 WAN: HD64572 already handles TX underruns with DMAC.
09fd65a WAN: TX-done handler now uses the ownership bit in HD64572 drivers.
abc9d91 WAN: convert HD64572-based drivers to NAPI.
3022439 WAN: remove SCA support from SCA-II drivers
8859736 WAN: remove SCA II support from SCA drivers
6b40aba WAN: split hd6457x.c into hd64570.c and hd64572.c
4e4fd4e ne2k: convert to net_device_ops
99921b7 eql: convert to net_device_ops
974acda sc92031: convert to net_device_ops
da1c14a qla3xxx: convert to net_device_ops
a8652d2 hamachi: convert to net_device_ops
c64213c bnx2x: convert to net_device_ops
6557d7b ns83820: convert to net_device_ops
bfd82c3 yellowfin: convert to net_device_ops
a7bd89c r6040: convert to net_device_ops
09ab9e7 sis900: convert to net_device_ops
2f30b1f tehuti: convert to net_device_ops
c3ecb9f sfc: convert to net_device_ops
1abd266 netxen: convert to net_device_ops
8765264 dl2k: convert to net_device_ops
0421eae bnx2: convert to net_device_ops
3addc56 mlx4: convert to net_device_ops
8126089 myri10ge: convert to net_device_ops
5d1d07d via-rhine: convert to net_device_ops
8668ae9 qlge: fix sparse warnings
25ed784 qlge: convert to net_device_ops
0402509 s2io: convert to net_device_ops
e48714b jme: convert driver to net_device_ops
e245a38 tg3: Update version to 3.96
2fbb69a broadcom: Add 57780 support
321d32a tg3: Add 57780 support
2243584 tg3: Allow GPHY powerdown on 5761
d5fe488 tg3: Embrace pci_ioremap_bar()
dfe00d7 tg3: Extract FW ver from alt NVRAM formats
6833c04 tg3: Enable GPHY APD on select devices
5e7dfd0 tg3: Prevent corruption at 10 / 100Mbps w CLKREQ
52f4490 tg3: Qualify use of tp->pcix_cap
ad82926 tg3: Use NET_IP_ALIGN
cf005b1 net: remove redundant argument comments
6c0bce3 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
e243455 e1000e: check return code from NVM accesses and fix bank detection
a20e4cf e1000e: fix incorrect link status when switch module pulled
8452759 e1000e: store EEPROM version number to prevent unnecessary NVM reads
0285c8d e1000e: cosmetic newline in debug message
5c48ef3 e1000e: sync change flow control variables with ixgbe
8f12fe8 e1000e: link up/down messages must follow a specific format
75eb0fa e1000e: ESB2 config after link up
438b365 e1000e: check return of pci_save_state
1605927 e1000e: update comments listing supported parts for each MAC family
63dcf3d e1000e: 82571 check for link fix on 82571 serdes
5aa49c8 e1000e: commit speed/duplex changes for m88 PHY
005cbdf e1000e: disable correctable errors for quad ports while going to D3
7e3aab4 inet_diag: Missed conversion after changing inet ehash lockl to
spinlocks.
176301e netdevice pc300: Add the reason about PC300 BROKEN in Kconfig
6636e11 netdevice pc300: Convert directly reference of netdev->priv
2baf8a2 netdevice hdlc: Convert directly reference of netdev->priv
f757fec net: use net_eq() in INET_MATCH and INET_TW_MATCH
b202226 ALSA: hda - Fix build without CONFIG_PROC_FS
b8b1d08 x86: entry_64.S: split out some macro's and move common code to
paranoid_exit
e2f6bc2 x86: entry_64.S: factor out save_paranoid and paranoid_exit
c002a1e x86: introduce save_rest and restructure the PTREGSCALL macro in
entry_64.S
c70bfa8 Merge branch 'topic/fix/hda' into topic/hda
d6752a5 ALSA: hda - mark Dell studio 1535 quirk
a1eb5fe wireless: missing include in lib80211.h
3461fc1 rtl8187: Update file authorship in comments
5984048 Update of MAINTAINERS for RTL8187
4f6d4d1 wireless: clean up sysfs code using %pM
96dd603 MAINTAINERS: claim maintenance over rtl818x drivers
da81ded rtl8180: adapt for deprecated IEEE80211_CONF_SHORT_SLOT_TIME flag
6272710 mac80211: add explicit padding in struct ieee80211_tx_info
beb2a7f net/ieee80211 -> drivers/net/ipw2x00/libipw_* rename
0795cd2 ipw2x00: relocate ipw2100/ipw2200 to common directory
2ba4b32 lib80211: consolidate crypt init routines
274bfb8 lib80211: absorb crypto bits from net/ieee80211
dfe1baf orinoco: fix last beacon reporting on 64-bit systems
1d047de mac80211: remove unnecessary include.
8ff48a8 rt2x00: Fix race condition when using inderect registers
bad1363 rt2x00: Optimize get_duration / get_duration_res
87c1687 drivers/net/wireless/ath9k/rc.c: use ARRAY_SIZE
f9f88fe mac80211_hwsim: Update documentation (AP mode enabled)
9902b18 mac80211: rc80211_pid eliminate sparse warnings
798b7ad rt2x00: Cleanup TX/RX entry handling
0ed94ea mac80211: remove more excess kernel-doc
e4e58cf iwlwifi: use Rx single frame mode (one Rx frame per RB)
01ef932 iwlwifi: get some more information about command failure
c24f081 iwl3945 : Simplify iwl3945_send_beacon_cmd
cb299ba iwlwifi: move iwl_print_hex_dump to iwl-debug.h
e720ce9 iwl3945 : Fix Sparse Warnings
21c339b iwlwifi: move spectrum measurement code to iwl-spectrum.c file
4ddbb7d iwlwifi: revamp tx scheduler byte count tables handling
8d86422 iwlwifi: move rx queue read pointer into rxq
5c5aa3f iwlwifi: update iwl-commands.h for 3 stream support
a71c8f6 iwlwifi: don't fail power set when calibration is not done yet
1933577 iwlwifi: trivial fix in includes
9bdf5ec iwl3945: fix resume for ADHOC network
ada1751 iwlagn: fix resume for ADHOC network
1e87d68 b43: remove rate index warning
7f3704e b43legacy: implement short slot and basic rate handling
3e4127f ipw2200: make association only if SSID is known.
ffb8267 ath9k: enable RXing of beacons on STA/IBSS
296bf2a ath5k: allow APs to receive beacons
6a53a8a ath5k: Fix IMR init
392dff8 ath9k : Display MAC/BB and RF version at startup (v2)
4821277 mac80211: fix BUILD_BUG_ON() caused by misalignment on arm
8b0162a ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
6d64360 rt2x00: Fix BUG_ON() with antenna handling
8058409 rt2x00: Block set_key() during suspend/shutdown
9a95dba rt2x00: Fix LED state handling
3d8606a rt2x00: Remove RATE_BASIC flag
1c740ed Move all rtl818x files to a common directory.
55b3961 mac80211_hwsim: enable Mesh Point operation
a3c9aa5 mac80211: disable BSSID filtering for mesh interfaces
b7b05fe ssb: struct device - replace bus_id with dev_name(), dev_set_name()
582c1b5 libertas: Fine grained configuration of wake-on-lan.
50da3ea ipw2100, ipw2200: select LIB80211
3d29b0c netdevice zd1201: Convert directly reference of netdev->priv to
netdev_priv()
4f90473 ALSA: ASoC: Fix typo in snd_soc_card update documentation
42e81c9 ALSA: hda - fix sparse warning
39639fa ASoC: Improve error reporting for AC97 reset failures
0e734ad ASoC: Staticise pxa2xx_pcm_ops
0c758bd ASoC: OMAP: Fix preprocessor filled DAI name in McBSP DAI
2dac921 ASoC: Add Marvell Zylonite machine support
14ae22b x86: entry_64.S: rename
e8a0e27 x86: clean up after: move entry_64.S register saving out of the
macros, fix
dee89c4 ASoC: Merge snd_soc_ops into snd_soc_dai_ops
a47cbe7 ASoC: Move DAI structure definitions into new soc-dai.h
5de27b6 ASoC: ssm2602: Update supported stream formats
faab5a3 ASoC: ssm2602: Fix priv substreams refs
bd903bd ASoC: Add abbreviation to maintainers for searchability
8750654 ASoC: Rename snd_soc_card to snd_soc_machine
98aa9c8 pkt_sched: sch_drr: Fix qlen in drr_drop()
9d2f472 ixgbe: convert directly reference of netdev->priv
11b444d ALSA: hda - Move HD-audio Kconfig items to sound/pci/hda/Kconfig
e7ee058 ALSA: hda - Make CONFIG_SND_HDA_RECONFIG for codec reconfiguration
f208dba ALSA: hda - Release ELD proc file
b94d353 ALSA: hda - Fix double free of jack instances
957ad01 sched: update comment for move_task_off_dead_cpu
fc02e90 Merge commit 'v2.6.28-rc6' into sched/core
0623536 ALSA: hda - Add missing static for snd_hda_eld_proc_new() inline
funciton
3ddd972 x86: signal: rename COPY_SEG_STRICT to COPY_SEG_CPL3
acdda79 ALSA: hda - support writing to the ELD proc file
db74210 ALSA: hda: modify monitor name to be consistent with other ELD proc
items
218b5ff ALSA: hda - properly print ELD sample bits
75a287d Merge branch 'topic/fix/hda' into topic/hda
c4900be ixgbe: add SFP+ driver support
859ee3c DCB: Add support for DCB BCN
0eb3aa9 DCB: Add interface to query the state of PFC feature.
33dbabc DCB: Add interface to query # of TCs supported by device
4613218 DCB: Add interface to query for the DCB capabilities of an device.
2f90b86 ixgbe: this patch adds support for DCB to the kernel and ixgbe driver
9db66bd net: convert TCP/DCCP ehash rwlocks to spinlocks
b8c26a3 ipgre: convert to netdevice_ops
1326c3d ipv6: convert tunnels to net_device_ops
23a12b1 ipip: convert to net_device_ops
748ff68 hippi: convert driver to net_device_ops
fd8f499 defxx: convert driver to net_device_ops
145186a fddi: convert to new network device ops
007c383 ipmr: convert ipmr virtual interface to net_device_ops
aa18e9e dummy: convert to net_device_ops
0082982 netdev: add more functions to netdevice ops
1725b82 ALSA: hda - make laptop-eapd model back for AD1986A
6ab33d5 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
7cc45e6 powerpc/ppc32: ftrace, dynamic ftrace to handle modules
f48cb8b powerpc/ppc64: ftrace, handle module trampolines for dyn ftrace
e4486fe powerpc: ftrace, use probe_kernel API to modify code
8fd6e5a powerpc: ftrace, convert to new dynamic ftrace arch API
6d07bb4 powerpc: ftrace, do not latency trace idle
dcd072e x86: clean up after: move entry_64.S register saving out of the macros
018a7bf netfilter: ip{,6}t_policy.h should include xp_policy.h
7be6065 netdevice wanrouter: Convert directly reference of netdev->priv
826dd0e netdevice ni65: Convert directly reference of netdev->priv
c8019bf netdevice ppp: Convert directly reference of netdev->priv
f7b2927 smsc95xx: add tx checksum offload support
8761169 sfc: Fix dependency for SFC_MTD
47a1a1d pkt_sched: remove unnecessary xchg() in packet classifiers
b94c8af pkt_sched: remove unnecessary xchg() in packet schedulers
c19d036 isdn: isdn_net.c annotate struct ip_ports and trivial sparse fixes
13d2a1d pkt_sched: add DRR scheduler
0c19b0a netlink: avoid memset of 0 bytes sparse warning
c010360 netdevice lance: Convert directly reference of netdev->priv
5377152 mv643xx_eth: calculate descriptor pointer only once in rxq_refill()
f61e554 mv643xx_eth: move receive error handling out of line
66e63ff mv643xx_eth: implement ->set_rx_mode()
66823b9 mv643xx_eth: inline txq_alloc_desc_index()
37a6084 mv643xx_eth: introduce per-port register area pointer
10a9948 mv643xx_eth: checkpatch fixes
21d1a16 net: ip_sockglue.c add static, annotate ports' endianness
00b5e50 myri10ge: remove hardcoded sram_size
d6279c8 myri10ge: fix per-slice rx/tx_dropped counters
d99015b x86: move entry_64.S register saving out of the macros
c032a2d Merge branch 'x86/cleanups' into x86/irq
87f7606 x86: fix wakeup_cpu with numaq/es7000 v2 - call ->update_genapic()
a61fc1e netdev/smc91x: unify Blackfin code a bit and use proper read/write
functions
3d3e35a dccp: Fix bracing in dccp_feat_list_lookup.
f4bdd26 netdevice hamradio: Convert directly reference of netdev->priv
56bc0f9 netfilter: nf_conntrack_proto_gre: spread __exit
f3a216d netdevice: 82596: Convert netdev->priv to netdev_priv
61d3015 netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooks
b0ceb56 netfilter: xt_recent: don't save proc dirs
d214c75 filter: add SKF_AD_NLATTR_NEST to look for nested attributes
68fd991 igb: Fix tx/rx_ring_count parameters for igb on suspend/resume/ring
resize
b2d5653 igb: simplify swap in clean_rx_irq if using packet split
3ef6b23 igb: update name to reflect new hardware
5caea4e net: listening_hash get a spinlock per bucket
bb55746 x86: fix arch/x86/kernel/setup.c build warning when
!CONFIG_X86_RESERVE_LOW_64K
90accd6 Merge branch 'linus' into x86/memory-corruption-check
77be80e x86: fix arch/x86/kernel/genx2apic_uv_x.c build warning when
!CONFIG_HOTPLUG_CPU
fbc2a06 Merge branch 'linus' into x86/uv
5b2d1ec ALSA: hda: Added Realtek ALC888 model entry for Acer Aspire 4930G
laptop
41dda0f ALSA: azx_probe() cleanup
d8b83c5 acenic: convert to net_device_ops
2c9171d niu: convert to net_device_ops
b94426b forcedeth: convert to net_device_ops
7c7d64b tg3: convert to net_device_ops
0edc352 ixgb: convert to net_device_ops
afe29f7 enic: convert to net_device_ops
52256cf ppp: convert to net_device_ops
acc7842 e100: convert to net_device_ops
2e5c692 igb: convert to net_device_ops
39a11bd via-velocity: convert to net_device_ops
0e7614b e1000: convert to net_device_ops
80ff32b cxgb2: convert to net_device_ops
dd75269 cxgb3: convert to net_device_ops
825a84d atlx: convert to net_device_ops
1e058ab atl1e: convert to net_device_ops
758e43b tun: convert to net_device_ops
48dfcde 8139: convert to net_device_ops
8b4ab28 r8169: convert to net_device_ops
f80d032 skge: convert to net_device_ops
1436b30 sky2: convert to net_device_ops
651c246 e1000e: convert to net_device_ops
eb7cc59 bonding: convert to net_device_ops
656299f vlan: convert to net_device_ops
5bc3eb7 ip: convert to net_device_ops for ioctl
54a30c9 macvlan: convert to net_device_ops
4456e7b veth: convert to net_device_ops
a2dbb88 bridge: convert to net_device_ops
8dfcdf3 ifb: convert to net_device_ops
c02373b netdev: convert loopback to net_device_ops
ccad637 netdev: expose ethernet address primitives
eeda3fd netdev: introduce dev_get_stats()
d314774 netdev: network device operations infrastructure
6b41e7d net: af_unix should use KERN_INFO instead of KERN_DEBUG
d171235 drivers/s390/ - csum_partial - remove unnecessary casts
07f0757 include/net net/ - csum_partial - remove unnecessary casts
a7a0d6a net: inet_diag_handler structs can be const
14e943d net: make /proc/net/protocols namespace aware
3680453 net: af_packet should update its inuse counter
9789cfe nfsctl: add headers for credentials
7596b27 coda: fix creds reference
ec4e0e2 sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares
9b0db7e ASoC: Convert blackfin machines to use DAI accessor functions
d0c3663 ASoC: s3c24xx_uda134x DAI accessor functions and static cleanup
df573d2 ASoC: Add support for omap2evm board
08bd168 ASoC: Add driver for the Lyrtech SFFSDR board
1c0090c ASoC: Add PCM3008 ALSA SoC driver
8563964 ALSA: hda - Show missing GPIO unsol bits
60a5151 profiling: clean up profile_nop()
9676e73 Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
86fa2f6 ftrace: fix selftest locking
3ac3ba0 Merge branch 'linus' into sched/core
ae8cb4c ALSA: hda: compact ELD output messages
d39b435 ALSA: hda: make global snd_print_pcm_bits()
06f69d1 ALSA: hda: minor output message cleanups
5b87ebb ALSA: hda: rename sink_eld to hdmi_eld
4e19c58 ALSA: hda: minor code cleanups
198d6ba Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
c6798d2 ALSA: hda: EAPD mute on suspend
9c8641e ALSA: hda: HDMI channel mapping cleanups
698544d ALSA: hda: HDMI channel allocations for audio infoframe
903b21d ALSA: hda: make global snd_print_channel_allocation()
5457a98 ALSA: hda: make standalone hdmi_fill_audio_infoframe()
cea555d Merge branch 'linux-2.6' into next
78608dd powerpc/mpic: Use new smp_request_message_ipi
25ddd73 powerpc: Provide a separate handler for each IPI action
a6326e9 powerpc: Correct page-in counter for CMM with 64k pages
22059a9 powerpc/pmac: Use of_find_node_with_property() in pmac_setup_arch()
ba82efb powerpc: Use of_find_node_with_property() in
cell_iommu_fixed_mapping_init()
5401817 powerpc: Use for_each_node_with_property() in of_irq_map_init()
1e291b1 of: Add helpers for finding device nodes which have a given property
ae564c6 powerpc: Optimise mutex
957ab07 powerpc: Optimise smp_rmb
46d075b powerpc: Optimise smp_wmb
a4e22f0 powerpc: Update 64bit __copy_tofrom_user() using
CPU_FTR_UNALIGNED_LD_STD
7526ff7 powerpc: Remove superfluous WARN_ON() from dma-noncoherent.c
efc3624 powerpc: Tell gcc when we clobber the carry in inline asm
d5e5491 powerpc: udbg-based backend for hvc_console
8c65318 serial/pmac_zilog: Add console polling support
9b82f3e powerpc/ps3: Replace the flip_ctl logic in ps3av and ps3fb by a mutex
a225063 ftrace: preemptoff selftest not working
ca3ea02 ASoC: Remove unused snd_soc_machine_config declaration
2af7529 sound: Fix warnings relating to ignored return value in
snd_card_register
b5fe363 x86: use update_genapic to get rid of ES7000_CLUSTERED_APIC v2
f632ddc x86: fix wakeup_cpu with numaq/es7000, v2, fix #2
6497760 x86: ia32_signal: change order of storing in setup_sigcontext()
047ce93 x86: ia32_signal: remove using temporary variable
8c6e5ce x86: ia32_signal: cleanup macro RELOAD_SEG
d71a68d x86: ia32_signal: introduce COPY_SEG_CPL3
b78a5b5 x86: ia32_signal: cleanup macro COPY
cbe9ee0 Merge branch 'x86/urgent' into x86/cleanups
a1afd01 x86: default to SWIOTLB=y on x86_64
72f2b89 ASoC: Move uda134x_codec.h to uda134x.h
a0bd65f ASoC: Blackfin: always set a default value for that GPIO range
27b9be5 ASoC: Blackfin: Simplify the MMAP_SUPPORT macros protected code
caa4583 ASoC: Blackfin: do not force TWI bus for ssm2602 codec
0cade26 ASoC: Fix Blackfin AC97 DAI probe function return code
a89e611 ASoC: Blackfin: Fix AD1980/1 build with MMAP support disabled
67f854b ASoC: Blackfin: add multi-channel function support
9905ed3 ASoC: AD1980 codec: add multi-channel function support
a11311d ASoC: Blackfin: updates Kconfig for SPORT
cb6e206 ASoC: DaVinci: Fix audio stall when doing full duplex
cd896c3 ALSA: hda - Allow multiple imux for matrix-type mixers of ALC codecs
e17b666 netfilter: nf_conntrack: fix warning and prototype mismatch
d9e1500 netfilter: nfnetlink_log: fix warning and prototype mismatch
19abb7b netfilter: ctnetlink: deliver events for conntracks changed from
userspace
226c0c0 netfilter: ctnetlink: helper modules load-on-demand support
0231022 tracing/function-return-tracer: add the overrun field
0619faf tracing/ftrace: make nop tracer using tracer flags
adf9f19 tracing/ftrace: implement a set_flag callback for tracers
a581780 Merge branch 'topic/fix/hda' into topic/hda
af9f341 ALSA: hda - Fix restore of pin configs at resume for STAC/IDT codecs
2c88587 ALSA: hda - Use init callback in stac92xx_resume()
e4973e1 ALSA: hda - Create jack detection elements in build_controls
f3a5c54 Merge branch 'master' into next
5a209c2 Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into
tracing/core
5f1e71b ALSA: ELD proc interface for HDMI sinks
7f4a9f4 ALSA: create hda_eld.c for ELD routines and proc interface
33deeca ALSA: introduce snd_print_pcm_rates()
2eca83b ALSA: hda: remove redundant get_amp_nid()
bc4a68f ALSA: snd-powermac: enable mic on iMac G4
54ac14a x86: fix wakeup_cpu with numaq/es7000, v2, fix
8d702f2 ASoC: Build tlv320aic23 cleanly
2adb983 ASoC: Manage VMID mode for WM8990
be1b87c ASoC: Enable WM8990 ADC clocking workaround
ba533e9 ASoC: Allow writes to uncached registers in WM8990
569712b x86: fix wakeup_cpu with numaq/es7000, v2
4dc06f9 netfilter: nf_conntrack: connection tracking helper name persistent
aliases
528a3a6 netfilter: ctnetlink: get rid of module refcounting in ctnetlink
bfe2967 netfilter: ctnetlink: use EOPNOTSUPP instead of EINVAL if the
conntrack has no helper
238ede8 netfilter: ctnetlink: use nf_conntrack_get instead of atomic_inc
7ad933d ASoC: Machine driver for for s3c24xx with uda134x
1cad1de ASoC: UDA134x codec driver
0c726da tracing: branch tracer, fix writing to trace/trace_options
6e5d9db ASoC: Fix for master playback/capture volume range for TWL4030 codec
9a57f7f net: sctp should update its inuse counter
a8076d8 net: af_unix should update its inuse counter
0bd7b79 x86: entry_64.S: remove whitespace at end of lines
9dacc71 Merge commit 'v2.6.28-rc5' into x86/cleanups
796359d ALSA: hda-intel: reorder HDMI audio enabling sequence
c0cea0d ALSA: hda: STAC_DELL_M6 EAPD
3ab9093 ALSA: hda: alc883 model for ASUS P5Q-EM boards
3f8e402 Merge branches 'tracing/branch-tracer', 'tracing/ftrace',
'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent'
into tracing/core
248969a net: af_unix can make unix_nr_socks visbile in /proc
c3ccc12 netdevice chelsio: Convert directly reference of netdev->priv
4d24b52 ematch: simpler tcf_em_unregister()
6eba6a3 net: Cleanup of af_unix
1910299 dccp: Tidy up setsockopt calls
dd9c0e3 dccp: Deprecate Ack Ratio sysctl
2945055 dccp: Feature negotiation for minimum-checksum-coverage
49aebc6 dccp: Deprecate old setsockopt framework
0c11683 dccp: Mechanism to resolve CCID dependencies
3f2c31d virtio_net: VIRTIO_NET_F_MSG_RXBUF (imprive rcv buffer allocation)
0276b49 virtio_net: hook up the set-tso ethtool op
0a888fd virtio_net: Recycle some more rx buffer pages
908cd2d net: use %pF for /proc/net/ptype
5635c10 net: make sure struct dst_entry refcount is aligned on 64 bytes
536533e rcu: documents rculist_nulls
3ab5aee net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls
88ab193 udp: Use hlist_nulls in UDP RCU code
bbaffac rcu: Introduce hlist_nulls variant of hlist
e8b2dfe TPROXY: implemented IP_RECVORIGDSTADDR socket option
8164f1b ipv4: Fix ARP behavior with many mac-vlans
6ea7ae1 e1000e: enable ECC correction on 82571 silicon
f004f3e phylib: make mdio-gpio work without OF (v4)
72af187 phylib: rename mdio-ofgpio to mdio-gpio
6817ba2 dm9000: Fix build error.
227a837 markers/tracpoints: fix non-modular build
cda2836 pegasus: minor resource shrinkage
74ad0a5 ixgbe: Fix usage of netif_*_all_queues() with netif_carrier_{off|on}()
0a7ad64 tracepoints: format documentation
0dcf8fe tracepoints, docs:
marker_synchronize_unregister->tracepoint_synchronize_unregister
8fd88d1 tracepoints: documentation fix for teardown
7e066fb tracepoints: add DECLARE_TRACE() and DEFINE_TRACE()
32f8574 tracepoints: use modules notifiers
5f38267 tracepoints: do not put arguments in name
c420970 tracepoints: use unregister return value
da7b3ea tracepoints: use rcu_*_sched_notrace
de0baf9 tracepoints: fix disable
2504ea5 tracepoints: samples, fix teardown
a0bca6a markers: create DEFINE_MARKER and GET_MARKER (new API)
c1df1bd markers: auto enable tracepoints (new API : trace_mark_tp())
a419246 markers: use module notifier
021aeb0 markers: use rcu_*_sched_notrace and notrace
e3f8c4b markers: add missing stdargs.h include, needed due to va_list usage
2bdba31 markers: fix unregister
954e100 rcu: add rcu_read_*_sched_notrace()
e7d3737 tracing/function-return-tracer: support for dynamic ftrace on
function return tracer
b01c746 tracing/function-return-tracer: add a barrier to ensure return stack
index is incremented in memory
9858096 Merge branch 'tracing/ftrace' into tracing/function-return-tracer
072b40a tracing/branch-tracer: fix a trace recursion on branch tracer
1c80025 tracing/ftrace: change the type of the init() callback
e6e7a65 tracing/ftrace: fix unexpected -EINVAL when longest tracer name is set
ee02a2e ftrace: make filtered functions effective on setting
982c350 ftrace: fix dyn ftrace filter
20e5227 ftrace: allow NULL pointers in mcount_loc
31e8890 ftrace: pass module struct to arch dynamic ftrace functions
d51ad7a ftrace: replace raw_local_irq_save with local_irq_save
918c115 ftrace: do not process freed records
b17e8a3 ftrace: disable ftrace on anomalies in trace start and stop
f3c7ac4 ftrace: remove condition from ftrace_record_ip
c91add5 Merge branches 'tracing/fastboot', 'tracing/ftrace' and
'tracing/urgent' into tracing/core
e2da9ba Merge branch 'topic/fix/hda' into topic/hda
e50a906 capabilities: define get_vfs_caps_from_disk when file caps are not
enabled
71cfc90 ASoC: Add WM8728 codec driver
2bef901 ASoC: Revert "ASoC: Add new parameter to s3c24xx_pcm_enqueue"
127e82e ALSA: hda - Support Headphone and Speaker volumes control on VAIO
8a75f4f ALSA: pcsp - Use HRTIMER_CB_IRQSAFE_UNLOCKED
ef711cf net: speedup dst_release()
f30ab41 pkt_sched: Remove qdisc->ops->requeue() etc.
38a7ddf tcp: remove an unnecessary field in struct tcp_skb_cb
00bcd52 isdn: use %pI4, remove get_{u8/u16/u32} and put_{u8/u16/u32} inlines
722024d x86: irq: fix apicinterrupts on 64 bits
2b82892 Merge branch 'master' into next
3a3b7ce CRED: Allow kernel services to override LSM settings for task actions
1bfdc75 CRED: Add a kernel_service object class to SELinux
3b11a1d CRED: Differentiate objective and effective subjective credentials on
a task
98870ab CRED: Documentation
d76b0d9 CRED: Use creds in file structs
1d04598 CRED: Prettify commoncap.c
a6f76f2 CRED: Make execve() take advantage of copy-on-write credentials
d84f4f9 CRED: Inaugurate COW credentials
745ca24 CRED: Pass credentials through dentry_open()
88e67f3 CRED: Make inode_has_perm() and file_has_perm() take a cred pointer
6cc88bc CRED: Rename is_single_threaded() to is_wq_single_threaded()
bb952bb CRED: Separate per-task-group keyrings from signal_struct
275bb41 CRED: Wrap access to SELinux's task SID
c69e8d9 CRED: Use RCU to access another task's creds and to release a task's
own creds
86a264a CRED: Wrap current->cred and a few other accessors
f1752ee CRED: Detach the credentials from task_struct
b6dff3e CRED: Separate task security context from task_struct
15a2460 CRED: Constify the kernel_cap_t arguments to the capset LSM hooks
1cdcbec CRED: Neuter sys_capset()
8bbf497 KEYS: Alter use of key instantiation link-to-keyring argument
e9e349b KEYS: Disperse linux/key_ui.h
76aac0e CRED: Wrap task credential accesses in the core kernel
b103c59 CRED: Wrap task credential accesses in the capabilities code
47d804b CRED: Wrap task credential accesses in the key management code
8192b0c CRED: Wrap task credential accesses in the networking subsystem
19d6562 CRED: Wrap task credential accesses in the UNIX socket protocol
8f41940 CRED: Wrap task credential accesses in the SunRPC protocol
c2a2b8d CRED: Wrap task credential accesses in the ROSE protocol
ba95b23 CRED: Wrap task credential accesses in the netrom protocol
f82b3590 CRED: Wrap task credential accesses in the IPv6 protocol
7340040 CRED: Wrap task credential accesses in the AX25 protocol
414c070 CRED: Wrap task credential accesses in the SYSV IPC subsystem
da9592e CRED: Wrap task credential accesses in the filesystem subsystem
82ab8de CRED: Wrap task credential accesses in the XFS filesystem
a5f773a CRED: Wrap task credential accesses in the UFS filesystem
7706bb3 CRED: Wrap task credential accesses in the UDF filesystem
26bf194 CRED: Wrap task credential accesses in the UBIFS filesystem
fc7333d CRED: Wrap task credential accesses in the SYSV filesystem
e2950b1 CRED: Wrap task credential accesses in the SMBFS filesystem
414cb20 CRED: Wrap task credential accesses in the ReiserFS filesystem
0785f4d CRED: Wrap task credential accesses in the RAMFS filesystem
c222d53 CRED: Wrap task credential accesses in the OMFS filesystem
b19c2a3 CRED: Wrap task credential accesses in the OCFS2 filesystem
5cc0a84 CRED: Wrap task credential accesses in the NFS daemon
4893702 CRED: Wrap task credential accesses in the NCPFS filesystem
922c030 CRED: Wrap task credential accesses in the Minix filesystem
8f659ad CRED: Wrap task credential accesses in the JFS filesystem
77c70de CRED: Wrap task credential accesses in the hugetlbfs filesystem
de395b8 CRED: Wrap task credential accesses in the HPFS filesystem
4ac8489 CRED: Wrap task credential accesses in the HFSplus filesystem
94c9a5e CRED: Wrap task credential accesses in the HFS filesystem
3de7be3 CRED: Wrap task credential accesses in the GFS2 filesystem
2186a71 CRED: Wrap task credential accesses in the FUSE filesystem
f0ce7ee CRED: Wrap task credential accesses in the FAT filesystem
4c9c544 CRED: Wrap task credential accesses in the Ext4 filesystem
6a2f90e CRED: Wrap task credential accesses in the Ext3 filesystem
a8dd4d6 CRED: Wrap task credential accesses in the Ext2 filesystem
4eea035 CRED: Wrap task credential accesses in the eCryptFS filesystem
ec4c2aa CRED: Wrap task credential accesses in the devpts filesystem
97b7702 CRED: Wrap task credential accesses in the Coda filesystem
a001e5b CRED: Wrap task credential accesses in the CIFS filesystem
1109b07 CRED: Wrap task credential accesses in the BFS filesystem
0eb790e CRED: Wrap task credential accesses in the autofs4 filesystem
73c646e CRED: Wrap task credential accesses in the autofs filesystem
2155998 CRED: Wrap task credential accesses in the AFFS filesystem
f8b9d53 CRED: Wrap task credential accesses in 9P2000 filesystem
cd80ca8 CRED: Wrap task credential accesses in the USB driver
ee9785a CRED: Wrap task credential accesses in the network device drivers
0e164b6 CRED: Wrap task credential accesses in the ISDN drivers
66303bc CRED: Wrap task credential accesses in the tty driver
b0fafa8 CRED: Wrap task credential accesses in the block loopback driver
350b4da CRED: Wrap task credential accesses in the x86 arch
e542370 CRED: Wrap task credential accesses in the S390 arch
1330deb CRED: Wrap task credential accesses in the PowerPC arch
25e1573 CRED: Wrap task credential accesses in the PA-RISC arch
b421273 CRED: Wrap task credential accesses in the MIPS arch
ef81ee9 CRED: Wrap task credential accesses in the IA64 arch
d1aaf8c tracing/fastboot: put error message on stderr
b3535c6 ftrace: remove unnecessary if condition of
__unregister_ftrace_function
cd80bc6 Merge branch 'topic/fix/hda' into topic/hda
0b60485 ASoC: OMAP: Add more supported sample rates into McBSP DAI driver
bbba944 ASoC: Fix supported sample rates of TWL4030 audio codec
c4da29c ALSA: hda - support detecting HD Audio devices with PCI class code
12ef7d4 ftrace: CPU buffer start annotation clean ups
ee6bce5 ftrace: rename iter_ctrl to trace_options
1696b2b ftrace: show buffer size in kilobytes
a94c80e ftrace: rename trace_entries to buffer_size_kb
24de386 Merge branches 'tracing/branch-tracer', 'tracing/fastboot',
'tracing/function-return-tracer' and 'tracing/urgent' into tracing/core
524ad0a netdevice: safe convert to netdev_priv() #part-4
8f15ea4 netdevice: safe convert to netdev_priv() #part-3
4cf1653 netdevice: safe convert to netdev_priv() #part-2
454d7c9 netdevice: safe convert to netdev_priv() #part-1
7a12122 net: Remove unused parameter of xfrm_gen_index()
2378982 net: ifdef struct sock::sk_async_wait_queue
3a95cb9 ALSA: handle SiI1392 HDMI codec in patch_intelhdmi.c
e4412cb bnx2: Update version to 1.8.2.
40105c0 bnx2: Reorganize timeout constants.
d8026d9 bnx2: Set rx buffer water marks based on MTU.
5ec6d7b bnx2: Restrict WoL support.
1caacec bnx2: Add PCI ID for 5716S.
1dc1c6a tracing/function-return-tracer: call prepare_ftrace_return by
registers
62d59d1 tracing/function-return-tracer: make the function return tracer
lockless
94b80ff ftrace: rename trace_unlikely.c file
80e5ea4 ftrace: add tracer called branch
9f029e8 ftrace: rename unlikely iter_ctrl to branch
2ed84ee trace: rename unlikely profiler to branch profiler
8652cb4 x86: warn of incorrect cpu_khz on AMD systems
8665596 x86: fix up the new IRQ code for older versions of gas
68f96c0 tracing/fastboot: fix perlcritic warning
c415b3d x86: disable IRQs before doing anything on nmi_shootdown_cpus()
bb8dd27 x86: make nmi_shootdown_cpus() available on !SMP and !X86_LOCAL_APIC
2ddded2 x86: move nmi_shootdown_cpus() to reboot.c
c370e5e x86 kdump: make nmi_shootdown_cpus() non-static
8e29478 x86 kdump: make kdump_nmi_callback() a function ptr on
crash_nmi_callback()
d1e7b91 x86 kdump: create kdump_nmi_shootdown_cpus()
b2bbe71 x86 kdump: move crashing_cpu assignment to nmi_shootdown_cpus()
a7d4182 x86 kdump: extract kdump-specific code from crash_nmi_callback()
fd64138 ALSA: include/sound/info.h - coding style changed
972d4c5 ALSA: hdsp/hdspm: remove card->id from rawmidi device name
c2eb9c4 ALSA: when card identification is changed, change also /proc/asound
symlink
9fb6198 ALSA: add /sys/class/sound/card#/id (r/w) and card#/number (r/o) files
eb42c75 Merge branch 'linus' into x86/crashdump
11843ee ALSA: powermac - Rename mic-analog loopback mixer element
68d119f tracing: finetune branch-tracer output
2b7d039 tracing: branch tracer, fix vdso crash
fb0ef64 ASoC: DaVinci: Audio: Fix swapping of channels at start of stereo
playback
9cc3c49 x86: ia32_signal: remove unnecessary padding
4a61204 x86: signal_32: introduce retcode and rt_retcode
f88c4ae tracing: branch tracer, tweak output
52f232c tracing: likely/unlikely branch annotation tracer
1f0d69a tracing: profile likely and unlikely annotations
cb9382e Merge branches 'tracing/fastboot', 'tracing/function-return-tracer'
and 'tracing/ring-buffer' into tracing/core
642edba ring-buffer: fix deadlock from reader_lock in read_start
92a77aa security: remove broken and useless declarations
a7d26f8 ALSA: Release v1.0.18a
7423907 tracing/fastboot: Use the ring-buffer timestamp for initcall entries
3f5ec13 tracing/fastboot: move boot tracer structs and funcs into their own
header.
60a011c Merge branch 'tracing/function-return-tracer' into tracing/fastboot
d06bbd6 Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
90d0be2 Merge branch 'topic/fix/hda' into topic/hda
e42ea98 net: Cleanup of neighbour code
7a9546e net: ib_net pointer should depends on CONFIG_NET_NS
8f424b5 net: Introduce read_pnet() and write_pnet() helpers
9eca0a4 dccp: Resolve dependencies of features on choice of CCID
d90ebcb dccp: Query supported CCIDs
e8ef967 dccp: Registration routines for changing feature values
f74e91b dccp: Limit feature negotiation to connection setup phase
6bb3ce2 net: remove struct dst_entry::entry_size
9b739ba net: remove struct neigh_table::pde
14d7ca5 x86: attempt reboot via port CF9 if we have standard PCI ports
7e452ba Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
3ac38c3 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
939b787 x86: 64 bits: shrink and align IRQ stubs
486936c Merge branch 'linux-2.6' into next
b7c6244 x86: 32 bits: shrink and align IRQ stubs
4687518 x86: 32 bit: interrupt stub consistency with 64 bit
3e89c7b ring-buffer: clean up warn ons
9ee670f x86/doc: spelling fix for grub
c280ea5 x86: fix documentation typo in arch/x86/Kconfig
a4c5279 x86, 64-bit: update address space documentation
9757d55 ath9k: Fix compilation failure when RFKILL is enabled
f83c9d0 ring-buffer: add reader lock
a98f8fd x86: apic reset counter on shutdown
d3ec5ca x86: call machine_shutdown and stop all CPUs in native_machine_halt
50ee917 sched/rt: removed unneeded defintion
934352f sched: add hierarchical accounting to cpu accounting controller
19b3e96 tracing: function return tracer, build fix
0667467 Currently SELinux jumps through some ugly hoops to not audit a
capbility
a2f2945 The oomkiller calculations make decisions based on capabilities.
Since
0611216 Add a new capable interface that will be used by systems that use
audit to
637d32d Capabilities: BUG when an invalid capability is requested
e68b75a When the capset syscall is used it is not possible for audit to
record the
3fc689e Any time fcaps or a setuid app under SECURE_NOROOT is used to result
in a
851f7ff This patch will print cap_permitted and cap_inheritable data in the
PATH
c0b0044 This patch add a generic cpu endian caps structure and externally
available
9d36be7 Document the order of arguments for cap_issubset. It's not instantly
clear
ff9b48c sched: include group statistics in /proc/sched_debug
a3d732f x86, UV: fix redundant creation of sgi_uv
867f7fb tracing, x86: function return tracer, fix assembly constraints
8587b33f [PATCH] nvram - convert PRINT_PROC to seq_file
971ddcf [PATCH] nvram - CodingStyle
f1c4be5 tracing, x86: clean up FUNCTION_RET_TRACER Kconfig
15e6cb3 tracing: add a tracer to catch execution time of kernel functions
caf4b32 tracing, x86: add low level support for ftrace return tracing
d844222 Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
f536aaf ring-buffer: replace most bug ons with warn on and disable buffer
5aa1ba6 ftrace: prevent ftrace_special from recursion
e0cb4eb Merge branch 'tracing/urgent' into tracing/ftrace
ae1e913 sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER =>
SCHED_OMIT_FRAME_POINTER
eb37b41 pktgen: add full reset functionality
9b1582d Phonet: use net_device built-in stats for GPRS
fb28ad3 net: struct device - replace bus_id with dev_name(), dev_set_name()
2377989 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
c483246 rtl8187: Change TX power settings
b2e53b3 orinoco: Move sources to a subdirectory
5166ccd cfg80211: Add kdoc for struct regulatory_request
b219cee cfg80211: make use of reg macros on REG_RULE
9c96477 cfg80211: Add regulatory domain intersection capability
d71aaf6 cfg80211: a reg rule is invalid if freq diff is 0
fc6971d mac80211_hwsim: Add support for client PS mode
fbf1892 mac80211: Allow AP mode to be enabled
d61272c mac80211: fix basic rates setting from association response
ab1ef98 mac80211_hwsim: Make sure beacon_timer gets deleted
3188848 nl80211: Add TX queue parameter configuration
1e898ff mac80211_hwsim: Debug info for TX queue parameters
90c97a0 nl80211: Add basic rate configuration for AP mode
fe63bfa mac80211_hwsim: Debug info for BSS config changes
95f8e38 b43legacy: reindent misleading statement
ccf5dd1 libertas_tf: fix skb tail pointer
9483407 p54: initialize all deprecated fields
c8034c4 p54: don't report known but unhandled EEPROM codes as unknown
61780ee iwlwifi: do not call statistics from rfkill
eb48dca iwlwifi: iwl-agn-rs: initialize rs with valid antenna
6a63578 iwlwifi: rename double inclusion protection name in iwl-commands.h
5b9f8cd iwlwifi: rename generic iwlagn functions that had a HW specific name
60294de iwlwifi: fix priv->iw_mode setting when multiple vif are configured
eb4779c iwlwifi: trivial removal of some 4965 remaining from iwl-agn-rs.h
9c80c50 iwlwifi: reorganize flow handler bitology
c7ab5ef b43: implement short slot and basic rate handling
bd81525 wireless: implement basic rate helper function
743b97c rt2x00: Remove debugfs CSR access wrappers
f161796 ath9k: correct warning about unintialized variable 'tid'
74508b2 rtl8187: Reduce channel switch delay
94d4fe9 rtl8187: Remove primitive write delays
946d1c2 rtl8187: Remove msleep calls after calls to rtl8225_write
a3d67bc rtl8187: Remove CCK delays
35cc988 rtl8187: Remove OFDM delays
2f20596 rtl8187: Remove large delays
9344e86 rt2x00: Release rt2x00 2.2.2
3514a44 rt2x00: Improve interface_modes initialization
c3fd7b4 rt2x00: Remove ieee80211_bss_conf from rt2x00_intf
e4ea1c4 rt2x00: Optimize configuration handling
3f64b43 ath5k: update keycache to support TKIP handling
9ad9a26 ath5k: enable hardware encryption for WEP
2a941ec wireless: fix two bad print_ssid conversions
8469cde mac80211: Add a new event in ieee80211_ampdu_mlme_action
dca3edb ath9k: Remove internal RX A-MPDU processing
7f95903 ath9k: Clear HT info on starting the driver
ccc75c5 ath9k: Remove ath_tx_aggr_resp()
05a1e2d ath9k: Enable interrupts at the proper place
154662a ath9k: Remove unnecessary TSF reset
9c84b79 ath9k: Streamline attach/detach
50fdae2 ath9k: Remove unused function ath_get_currentCountry()
f1dc560 ath9k: Refactor hw.c
5640b08 ath9k: Revamp VAP management
a37c2c7 ath9k: Use bitfields to store tid's state in a single variable
102e057 ath9k: Ensure ath_node is not NULL when updating tx chainmask
43453b3 ath9k: Remove SM Power Save as it is not supported now
528f0c6 ath9k: Revamp transmit control block
c517016 ath9k: Simplify node attach/detach routines
b5aa9bf ath9k: Node cleanup
17683c6 ath5k: fix keytable type buglet in ath5k_hw_reset_key
f07a6c4 ath5k: Update PCU code
2c70600 don't use net/ieee80211.h
9b1fbae iwl3945: remove bogus comment
41bb73e mac80211: remove SSID driver code
b23f99b adm8211: remove SSID code
71c11fb b43/legacy: remove SSID code
4607816 iwlwifi: remove unused essid variable
a57a59f iwlwifi: remove implicit direct scan
430cfe9 iwl3945: remove dead code
e5704bf ath9k: remove useless NULL initialisers
2df7816 wireless: fix a few sparse warnings
1239cd5 wireless: move mesh config length constant
97c8b01 mac80211: print reason code for deauth/dissoc frames
db4186c p54: eliminate warning for uninitialized variable 'tim_len'
e5ea92a p54: AP & Ad-hoc testing
94585b0 p54: put broadcast frames into the right queues
9e7f3f8 p54: more definitions form lmac_longbow.h and pda.h
9a8675d p54: introduce new names for device firmwares
4ceb7b6 netdevice libertas: Fix directly reference of netdev->priv
f43aa02 ALSA: hda - Fix another cache list management
b402dff ASoC: Add Right-Justified mode and Codec clock master to davinci-i2s
53599bb ASoC: s3c24xx 8 bit sound fix
ba21ebb x86: apic - use pr_ macros for logging
4e03043 x86: apic - calibrate_APIC_clock remove redundant irq-enable-disable
4ecd33d Merge commit 'v2.6.28-rc4' into x86/apic
f4166c5 x86, bts: DS and BTS initialization
19f47c6 x86: x86_32 has its own irq_regs definition
87135d9 Merge commit 'v2.6.28-rc4' into x86/cleanups
4fcc50a x86: clean up vget_cycles()
39c9aed SELinux: Use unknown perm handling to handle unknown netlink msg types
cb9e35d x86: clean up rdtsc_barrier() use
895e031 Merge branch 'linus' into x86/cleanups
15002fa x86: signal: cosmetic unification of setup_sigcontext()
a309720 ftrace: display start of CPU buffer in trace output
769c48e ftrace: force pass of preemptoff selftest
7d5222a ftrace: align __mcount_loc sections
c76f069 ftrace: remove trace array ctrl
bbf5b1a ftrace: remove ctrl_update method
49833fc ftrace: enable trace_printk by default
4519317 ftrace: irqsoff tracer incorrect reset
e168e05 ftrace: fix sched_switch API
75f5c47 ftrace: fix boot trace sched startup
0183fb1 ftrace: fix set_ftrace_filter
a6b0786 Merge branches 'tracing/ftrace', 'tracing/fastboot',
'tracing/nmisafe' and 'tracing/urgent' into tracing/core
f574179 tipc: trivial endian annotation in debug statement
f400923 pkt_sched: Control group classifier
505d4f7 net: Guaranetee the proper ordering of the loopback device. v2
5d6d480 net: fib_rules ordering fixes.
3d8160b Revert "net: Guaranetee the proper ordering of the loopback device."
0edb945 ALSA: hda - Fix probe errors on Dell Studio Desktop
30cde0a ALSA: hda - Fix ALC260 hp3013 master switch
26df91c ASoC: TLV320AIC23B Support more sample rates
167c627 Merge branch 'davem-next' of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
6d21cd6 sched: clean up SCHED_CPUMASK_ALLOC
258594a Merge branch 'sched/urgent' into sched/core
f66fced ALSA: Document debug macros
a827206 fmvj18x_cs: write interrupt ack bit for lan and modem to work
simultaneously.
945eed0 ALSA: Evaluate condition in snd_BUG_ON() in non-debugging case
0774023 Merge branch 'topic/fix/hda' into topic/hda
63cf123 Merge branch 'topic/fix/misc' into topic/misc
5c7f033 phonet: sparse annotations of protocol, remove forward declaration
ca62059 ipvs: oldlen, newlen should be be16, not be32
76acfdb net: mark flow_cache_cpu_prepare() as __init
9eeda9a Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
ea2da6e ALSA: hda - Fix broken hash chain allocation
b910d9a ALSA: hda - Add max allocation check in array allocator
c217429 ALSA: hda - Add missing NULL check in amp hash allocation
a87d091 x86, sched: enable wchan config menu item on 64-bit
6a60dd1 ftrace: split out hardirq ftrace code into own header
cf7f869 sched, lockdep: inline double_unlock_balance()
6415483 ALSA: hda - Add lifebook model for Realtek ALC269
6ce4a3b ALSA: hda - Make codec-probing more robust
33fa35e ALSA: hda - simplify hda_bus ops callbacks
e18c94d ALSA: ASoC: TWL4030 codec - fix 256*Fs clock
fd51b2d x86: update CONFIG_NUMA description
90080bf sched, documentation: update scheduler header file paths
8735b7d x86: signal_64: make setup_sigcontext() similar
ee7d523 x86: signal_64: setup fpstate in setup_sigcontext()
99ea1b9 x86: ia32_signal: do save_i387_xstate_ia32 at get_sigframe()
4b33669 x86: signal_32: do save_i387_xstate() at get_sigframe()
3e03fb7 ring-buffer: convert to raw spinlocks
9036990 ftrace: restructure tracing start/stop infrastructure
0f04870 ftrace: soft tracing stop and start
60a7ecf ftrace: add quick function trace stop
79c81d2 Merge branch 'tracing/fastboot' into tracing/ftrace
fd9abb3 SMSC LAN911x and LAN921x vendor driver
c5916cf ehea: Fix some whitespace issues
739bb23 sfc: Do not reset when hardware monitor detects a fault
3e133c4 sfc: Use lm87 and lm90 drivers for board temperature/power monitoring
f415072 sfc: Expose flash region storing boot code as MTD
0a95f56 sfc: Clean up non-volatile memory partitioning
2883f55 sfc: Correct address of gPXE boot configuration in EEPROM
fd989c8 bonding: alternate agg selection policies for 802.3ad
6146b1a bonding: Fix ALB mode to balance traffic on VLANs
305d552 bonding: send IPv6 neighbor advertisement on failover
7d9d1f2 sgi-xp: support getting the address of a partition's reserved page
31de5ec sgi-xp: define xp_partition_id and xp_region_size
2525789 sgi-xp: create activate and notify gru message queues
6c1c325 sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect()
23c3570 x86: uv: Add UV reserved page bios call
e8929c8 x86: uv: Add UV memory protection bios call
64ccf2f x86: uv: Add UV watchlist bios call
61c9eaf pkt_sched: Fix qdisc len in qdisc_peek_dequeued()
0a36b34 net: Don't leak packets when a netns is going down
ae33bc4 net: Guaranetee the proper ordering of the loopback device.
d0c082c netns: Delete virtual interfaces during namespace cleanup
1c1b777 powerpc: Use the new byteorder headers
1f29fae file capabilities: add no_file_caps switch (v4)
e21e696 Merge branch 'master' into next
2f99db2 selinux: recognize netlink messages for 'ip addrlabel'
5b4d218 powerpc/boot: Allocate more memory for dtb
7d4320f powerpc: Hugetlb pgtable cache access cleanup
d4ad304 powerpc/ps3: Fix memory leak in device init
3cc6987 powerpc: Eliminate unused do_gtod variable
597bc5c powerpc: Improve resolution of VDSO clock_gettime
c73049f powerpc: Remove map_/unmap_single() from dma_mapping_ops
7eef440 powerpc/pci: Cosmetic cleanups of pci-common.c
fd6852c powerpc/pci: Fix various pseries PCI hotplug issues
b5ae5f9 powerpc/pci: Make pcibios_allocate_bus_resources more robust
57b066f powerpc/eeh: Make EEH device add/remove more robust
8b8da35 powerpc/pci: Split pcibios_fixup_bus() into bus setup and device setup
8dc840f ASoC: Add new parameter to s3c24xx_pcm_enqueue
ea91394 ASoC: Remove core version number
74e7220 ASoC: Add Palm/PXA27x unified ASoC audio driver
838e8bb x86: Implement change_bit with immediate operand as "lock xorb"
6834d7c ALSA: ice1724 - Re-fix IRQ mask initialization
c238b4f ALSA: hda - Split ALC268 acer model
ab56ced powerpc/pci: Remove pcibios_do_bus_setup()
5328032 powerpc/pci: Use common PHB resource hookup
b0494bc powerpc/pci: Cleanup debug printk's
25d6e2d powerpc: Update 64bit memcpy() using CPU_FTR_UNALIGNED_LD_STD
4ec577a powerpc: Add new CPU feature: CPU_FTR_UNALIGNED_LD_STD
4090019 powerpc: Update page-in counter for CMM
1ef8014 powerpc/pseries: Fix getting the server number size
691de57 powerpc: Remove device_type = "rtc" properties in .dts files
a6a8e00 powerpc: Silence software timebase sync
1fd0f52 powerpc: Fix domain numbers in /proc on 64-bit
270acef net: sk_free_datagram() should use sk_mem_reclaim_partial()
d99a7bd dccp: Cleanup routines for feature negotiation
ac75773 dccp: Per-socket initialisation of feature negotiation
61e6473 dccp: List management for new feature negotiation
7d43d1a dccp: Implement lookup table for feature-negotiation information
bd012f2 dccp: Basic data structure for feature negotiation
13c9474 ALSA: hda - Add ASUS V1Sn support
beb0b9c ALSA: hda - Fix unused function in patch_intelhdmi.c
9150487 ALSA: hda - Intel HDMI audio support
d5f6423 net: #ifdef ->sk_security
fd8cd7e x86: vmware: look for DMI string in the product serial key
41d9f9c SELinux: hold tasklist_lock and siglock while waking wait_chldexit
0ee4663 ALSA: ASoC - Remove unnecessary inclusion of linux/version.h
3865675 ALSA: ASoC codec: remove unused #include <version.h>
bfc5c26 ALSA: hda - Don't create empty PCM streams
79a9d46 tracing/ftrace: fix a bug when switch current tracer to sched tracer
efade6e tracing/ftrace: types and naming corrections for sched tracer
d7ad44b tracing/fastboot: use sched switch tracer from boot tracer
e55f605c tracing/ftrace: remove unused code in sched_switch tracer
07695fa tracing/ftrace: fix a race condition in sched_switch tracer
71566a0 tracing/fastboot: Enable boot tracing only during initcalls
6e3354c netfilter: nf_nat: remove warn_if_extra_mangle
249b620 netfilter: netns ebtables: br_nf_pre_routing_finish() fixup
b71b30a netfilter: netns ebtables: ebtable_nat in netns
4aad109 netfilter: netns ebtables: ebtable_filter in netns
8157e6d netfilter: netns ebtables: ebtable_broute in netns
dbcdf85 netfilter: netns ebtables: more cleanup during ebt_unregister_table()
6beceee netfilter: netns ebtables: part 2
511061e netfilter: netns ebtables: part 1
19223f2 netfilter: arptable_filter: merge forward hook
d4ec52b netfilter: netns-aware ipt_addrtype
5f7340e netfilter: xt_NFLOG: don't call nf_log_packet in NFLOG module.
3299b4d ftrace: sysctl typo
69f698a ftrace: sysrq-z to dump the buffers
6cf87ef x86 debug: mark early_printk.o as notrace
faa2f98 sched: add sanity check in partition_sched_domains()
a17e226 sched: remove redundant call to unregister_sched_domain_sysctl()
0a0db8f sched debug: remove NULL checking in print_cfs/rt_rq()
eefd796 sched debug: remove sd_level_to_string()
b2a866f ftrace: function tracer with irqs disabled
182e9f5 ftrace: insert in the ftrace_preempt_disable()/enable() functions
8f0a056 ftrace: introduce ftrace_preempt_disable()/enable()
124ffe1 x86: signal_64: remove unused code in __setup_rt_frame()
b91f080 ALSA: hda - Fix possible NULL dereference
dce908e ALSA: SOC: Fix setting codec register with debugfs filesystem merge
error
d2ad3ca net/: Kill now superfluous ->last_rx stores.
265eb67 netem: eliminate unneeded return values
babcda7 drivers/net: Kill now superfluous ->last_rx stores.
ab29109 net: remove two duplicated #include
6d9f239 net: '&' redux
6cf3f41 bonding, net: Move last_rx update into bonding recv logic
24f8b23 net: increase receive packet quantum
b9ac998 printk: ipv4 address digits printed in reverse order
4814893 IPVS: Remove supports_ipv6 scheduler flag
4454837 IPVS: Add IPv6 support to LBLC/LBLCR schedulers
fa228b3 tg3: Update version to 3.95
772638b broadcom: Add support for BCM50610
042a75b broadcom: Refine expansion register access routine
5e0c676 broadcom: Add flow control support
fcb389d tg3: 5785 enhancements
9c61d6b tg3: Refine phylib support
0a459aa tg3: Allow WOL for phylib controlled Broadcom phys
05ac4cb tg3: Refine power management and WOL code
df59c94 tg3: Move phylib report to end of tg3_init_one
b2b98d4 tg3: Do not enable APE on bcm5700
bcb37f6 tg3: Reclaim TG3_FLG3_5761_5784_AX_FIXES flag
3f00789 tg3: Preserve LAA when device control is released
b2aee15 tg3: Preserve DASH connectivity when WOL enabled
6353239 tg3: Use pci_ioremap_bar()
c88e668 tg3: Add 5761S support
6bdbfe9 x86: VMware: Fix vmware_get_tsc code
4ef0ef1 ALSA: hda - Fix missing ADC list in ALC260 auto-probe mode
26f5df2 ALSA: hda - Add ALC299 fujitsu preset model
67305eb pkt_sched: sch_generic: Kfree gso_skb in qdisc_reset()
5799de0 net: clean up net/ipv4/tcp_ipv4.c
539afed net: clean up net/ipv4/devinet.c
f4cca7f net: clean up net/ipv4/pararp.c
fd3f8c4 net: clean up net/ipv4/ip_fragment.c tcp_timer.c ip_input.c
e113a74 sched/rt: small optimization to update_curr_rt()
7e5e26a ftrace: fix hardirq header for non ftrace archs
7a895f5 Merge branches 'tracing/ftrace', 'tracing/markers',
'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and
'tracing/urgent' into tracing/core
127cafb tracepoint: introduce *_noupdate APIs.
19dba33 tracepoint: simplification for tracepoints using RCU
3555105 x86: add memory hotremove config option
c354e12 net: clean up net/ipv4/ipmr.c
09cb105 net: clean up net/ipv4/ip_sockglue.c tcp_output.c
a7e9ff7 net: clean up net/ipv4/igmp.c
6ed2533 net: clean up net/ipv4/fib_frontend.c fib_hash.c ip_gre.c
5a5f3a8 net: clean up net/ipv4/ipip.c raw.c tcp.c tcp_minisocks.c tcp_yeah.c
xfrm4_policy.c
d931910 net: clean up net/ipv4/ah4.c esp4.c fib_semantics.c
inet_connection_sock.c inetpeer.c ip_output.c
5b9a0e1 x86: nmi - nmi_watchdog boot param docs cleanup
d9e5407 ftrace: ftrace_dump_on_oops=[tracer]
3660946 Merge commit 'v2.6.28-rc3' into tracing/ftrace
8bb8c43 sched, ftrace: trace sched.c
db59350 Merge commit 'v2.6.28-rc3' into sched/core
e0db4a7 sunrpc: Fix build warning due to typo in %pI4 format changes.
20971a0 IPVS: Add IPv6 support to SH and DH schedulers
2a6cf35 Merge branch 'davem-next' of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
3f8b4b1 bonding: update docs to correctly reflect arp_ip_target behavior
237f3e1 smc91x: add __init markings to smc_drv_probe()
dccd547 forcdeth: increase max_interrupt_work
0befdb3 ixgbe: add device support for 82598AT (copper 10GbE) adapters
e053b62 atlx: timer cleanup
02e7173 atlx: use embedded net_device_stats
8ba25da sch_netem: Replace ->requeue() method with open code
0220146 sch_netem: Remove classful functionality
ae27e98 [TCP] CUBIC v2.3
e27dfce af_unix: clean up net/unix/af_unix.c garbage.c sysctl_net_unix.c
c37ccc0 udp: add a missing smp_wmb() in udp_lib_get_port()
7e3a42a xfrm6: handling fragment
395628e x86: Skip verification by the watchdog for TSC clocksource.
eca0cd0 x86: Add a synthetic TSC_RELIABLE feature bit.
88b094f x86: Hypervisor detection and get tsc_freq from hypervisor
49ab56a x86: add X86_FEATURE_HYPERVISOR feature bit
4074ea2 ALSA: ice1724 - Fix IRQ register initialization
e25cf4a mac80211: fix two kernel-doc warnings
4c24429 ath9k: use ETH_P_PAE
9371dd6 ath9k: remove useless conditional
4fb3078 orinoco: cache downloadable firmware image in memory for use during
resume
0df6cbb orinoco: reload firmware on resume
4c674c6 ath5k: Update interrupt masking code
84fa4f4 wireless regulatory: move ignore_request
2083c49 wireless: clean up regulatory ignore_request function
be3d481 wireless: remove struct regdom hinting
d2372b3 wireless: make regdom passing semantics simpler
7dddaf1 iwlwifi: Update reclaim flag
9fe1c50 iwl3945: iwl3945_mac_get_tsf() should not return zero
a96a27f iwlwifi: run through spell checker
127901a iwlwifi: refactor tx byte count table usage
951891c iwlwifi: clear scanning bits upon failure
60d3221 iwlwifi: convert correctly rate_n_flags to PLCP index for mimo3
packets
f69f42a iwlwifi: calibration command namespace renaming
0ef2ca6 iwlwifi: parametrize eeprom versions
ed7fafe iwlwifi: don't update TFD free counter for invalid station
3fd07a1 iwlwifi: refactor TX response flow
8b30b1f mac80211: Re-enable aggregation
4393dce mac80211: allow all interfaces types to handle RX action frames
f3e63db wireless: remove write-only 'granted' variable
a4510bf ath9k: Check if the STA supports HT when initializing rate control
075cbc9 mac80211: Change WARN_ON to WARN_ON_ONCE
5c020dc ath9k: Allow user to change tx power when asked
f97e400 ath9k: enable RX interrupt mitigation
b139a10 ath9k: remove pointless sc_txintrperiod and spin_lock_bh on tx prepare
d9d2925 mac80211: make use of regulatory tx power settings on change of tx
power
e2ef12d mac80211: check return value of dev_alloc_skb() in
ieee80211_sta_join_ibss().
7211801 wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts
9387b7c wireless: use individual buffers for printing ssid values
2819f8a wireless: escape_ssid should handle non-printables
c5d3dce wireless: remove NETWORK_EMPTY_ESSID flag
7e272fc wireless: consolidate on a single escape_essid implementation
ddf4ac5 mac80211: insert AP sta entry after filling it
cfa3fa4 Fix debugfs_create_*'s error checking method for wireless/rt2x00/
9b24001 Fix debugfs_create_bool's error checking method for wireless/iwlwifi/
ac9440a wireless: fix EU check
f6037d0 wireless: get rid of pointless request list
f3b407f wireless: remove cfg80211_reg_mutex
cf03268 wireless: don't publish __regulatory_hint
e37d4df mac80211: fix a few typos in mac80211 kernel doc
5588751 rt2x00: reduce checkpatch.pl errors
0bbac08 ath5k: reduce checkpatch.pl errors
93da9cc Add nl80211 commands to get and set o11s mesh networking parameters
4a68ec5 mac80211: inform userspace of probe/auth/assoc timeout
8216bfe hostap: Fix sparse warnings
50fb2e4 mac80211: remove rate_control_clear
65a0667 iwlwifi: protect headers from double inclusion
f4a8cd9 minstrel: improve performance for non-MRR drivers
0a9542e nl80211: fix monitor flags
27df605 p54: integrate parts of lmac_longbow.h and other parts of stlc45xx
5e73444 p54: borrow some setup code from stlc45xx
b92f30d p54: fix memory management
9de5776f p54: p54: refactor p54_rx_frame_sent
0f1be97 p54: refactor statistic timer code
0fdd7c5 p54: broken out edcf changes
b88b15d iwlwifi: tx command must run on same tfd as packet
499b188 iwlwifi: fix TX cmd dma unmapping
76eff18 iwlwifi: unify tx antenna toggling
961ba60 iwlwifi: add iwl_cmd_queue_free for readability
3257e5d iwlwifi: remove host commands structures from iwl_cmd
56e1261 iwlwifi: expand error lookup and align output
4e062f9 iwlwifi: define firmware file name once
4acf074 make ieee80211 invisible
5c7f9b7 ipw2x00: change default policy for auto-associate
c12abae p54: implement MRR
e6a9854 mac80211/drivers: rewrite the rate control API
cb121ba mac80211: add might_sleep to hw_config
faf3994 airo: Kill directly reference of netdev->priv
b706e65 ath5k: fix mesh point operation
6e0e0bf ath5k: correct ath5k signal quality
c49d154 ath9k: correct signal quality report
4fe0657 ath5k/ath9k: correct signal quality
f828831 rtl8187: add short slot handling for 8187B
6476107 rtl8187: adapt for deprecated IEEE80211_CONF_SHORT_SLOT_TIME flag
da966bc Ath5k: add AP mode
7eb27af p54/rtl8187: fix up the seqno patch
ae5eb02 mac80211: rewrite HT handling
bda3933 mac80211: move bss_conf into vif
9124b07 mac80211: make retry limits part of hw config
5251818 iwl3945: fix station stuff in RC algorithm
d51626d nl80211: export HT capabilities
9477828 mac80211: provide sequence numbers
2e20cc3 p54: Move rx_mtu to struct bootrec_desc
7823657 rfkill: rate-limit rfkill-input workqueue usage (v3)
1767079 rfkill: honour EPO state when resuming a rfkill controller
d003922 rfkill: add master_switch_mode and EPO lock to rfkill and rfkill-input
68d2413 rfkill: export global states to rfkill-input
cf4b4aa rfkill: use killable locks instead of interruptible
e897558 mac80211: introduce hw config change flags
0f4ac38 mac80211: kill hw.conf.antenna_sel_{rx,tx}
d9fe60d 802.11: clean up/fix HT support
40333e4 p54: honour bss_info_changed's short slot time settings
5d6924e mac80211: use HWSIM_STA_MAGIC in hwsim_check_sta_magic() and
hwsim_set_sta_magic().
3195c1f iwlwifi: refactor rxon time command
5d664a4 iwlwifi: take a valid antenna upon rate scale init
be5d56e iwlwifi: make initial calibration set configurable
1397dce mac80211: remove unused declaration of struct sta_attribute.
7a5158e mac80211: fix short slot handling
e87a2fe mac80211: remove max_antenna_gain config
d73782f mac80211: clean up ieee80211_hw_config errors
3db5943 mac80211: remove wiphy_to_hw
c6a1fa1 mac80211: minor code cleanups
36ff382 mac80211: remove writable debugs mesh parameters
804feeb mac80211: remove aggregation status write support from debugfs
b2bcc7b x86: add a synthetic TSC_RELIABLE feature bit
3c3e989 ALSA: hda - Re-add input-source control for Realtek
f9e336f ALSA: hda - Unify capture mixer creation in realtek codes
54cbc9a ALSA: hda - Unify capture callbacks in realtek codes
d88897e ALSA: hda - Use macros to check array overflow
afecd78c Merge branch 'topic/fix/hda' into topic/hda
7b3b6e4 Merge commit 'v2.6.28-rc2' into topic/asoc
04172c0 Merge branch 'topic/fix/asoc' into topic/asoc
5b99e6c ASoC: Add audio support for the Atmel AT91SAM9G20ek board(uing
wolfson 8731).
6c74250 ASoC: Merge AT91 and AVR32 support into a single atmel architecture
dc06102 ASoC: Add support for Beagleboard
4e20787 ASoC: Add support for Gumstix Overo
cc17557 ASoC: Add support for TWL4030 audio codec
a376f30 x86: avoid duplicate running of pud_offset and pmd_offset in
one_md_table_init()
a26a2a2 ftrace: nmi safe code clean ups
9868ee6 kexec/i386: setup kexec page table in C
92be3d6 kexec/i386: allocate page table pages dynamically
31498a0 kexec/i386: remove PAGE_SIZE alignment from relocate_kernel
3685f25 misc: replace NIPQUAD()
be85940 fs: replace NIPQUAD()
6377943 drivers: replace NIPQUAD()
21454aa net: replace NIPQUAD() in net/*/
14d5e83 net: replace NIPQUAD() in net/netfilter/
673d57e net: replace NIPQUAD() in net/ipv4/ net/ipv6/
cffee38 net: replace NIPQUAD() in net/ipv4/netfilter/
77be155 pkt_sched: Add peek emulation for non-work-conserving qdiscs.
03c05f0 pkt_sched: Use qdisc->ops->peek() instead of ->dequeue() & ->requeue()
8e3af97 pkt_sched: Add qdisc->ops->peek() implementation.
99c0db2 pkt_sched: sch_generic: Add generic qdisc->ops->peek() implementation.
48a8f51 pkt_sched: Add ->peek() methods for fifo, prio and SFQ qdiscs.
90d841f pkt_sched: sch_generic: Add Qdisc_ops peek() method.
cc0fe83 xfrm: remove unused struct xfrm_policy::next
d5917a3 xfrm: C99 for xfrm_dev_notifier
a1744d3 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
57b4189 ALSA: ASoC - restore removed variable declaration
275f165 pci: use pci_ioremap_bar() in drivers/net
842e08b tc35815: Define more Rx status bits
04ecb07 cxgb3 - enable lro control through ethtool
bc79fc8 e100: adapt to the reworked PCI PM
6b1abba The overdue eepro100 removal.
5177b32 skge: adapt skge to use reworked PCI PM
b3acf29 ftrace, kbuild: condense recordmcount.pl parameter code
e1e302d Merge branch 'linus' into tracing/ftrace
c8db3fe udp: Should use spin_lock_bh()/spin_unlock_bh() in udp_lib_unhash()
b807c3d ftrace: nmi update statistics
17666f0 ftrace: nmi safe code modification
1cbd8b3 x86: add two missing unwind annotations
8a1c8eb x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2
b062f84 x86: nmi - add sensible names to nmi_watchdog boot param
7a52768 x86: simplify X86_MPPARSE config option
0763722 ALSA: ASoC - Fix a typo in Kconfig
0c235d1 ASoC: Disable automatic volume control in the CS4270 sound driver
ca53fb2 ASoC: Use finer grained dependencies in SND_SOC_ALL_CODECS
e775f6c ASoC: Do a warm reset after cold when resetting the WM9713
1b340bd ASoC: Add PXA SSP support
8b6a5a3 SELinux: check open perms in dentry_open not inode_permission
219b93f ASoC: Remove DAPM restriction on mixer control name lengths
f24368c ASoC: Convert core to use standard debug print macros
d45f621 ASoC: Fix handling of DAPM suspend work
12ef193 ASoC: Allow setting codec register with debugfs filesystem
5791775 x86: signal: cosmetic unification of NR_restart_syscall
cabf503 x86: signal: cosmetic unification of macros for setup_rt_frame()
96bf84b x86: signal: cosmetic unification of signr_convert()
34f3a81 sched: switch sched_features to seqfile
8cf14e3 net: easy removals of HIPQUAD using %pI4 format
9edb8bb macvlan: add support for ethtool get settings
6b9a106 printk: remove %p6 format specifier, fix up comments
5b095d9 net: replace %p6 with %pI6
4b7a427 net: replace %#p6 format specifier with %pi6
4aa9960 printk: add %I4, %I6, %i4, %i6 format specifiers
96631ed udp: introduce sk_for_each_rcu_safenext()
f52b505 udp: udp_get_next() should use spin_unlock_bh()
e78a37b ALSA: Fix a typo in Kconfig
9cbbb3a ALSA: Release v1.0.18
eab1722 sched: cleanup for alloc_rt/fair_sched_group()
8203efb udp: calculate udp_mem based on low memory instead of all memory
271b72c udp: RCU handling for Unicast packets.
645ca70 udp: introduce struct udp_table and multiple spinlocks
1b063c3 Merge branch 'topic/fix/hda' into topic/hda
d301fc3 ALSA: hda - Fix indentation in hda_local.h
b189db5 net: remove NIP6(), NIP6_FMT, NIP6_SEQFMT and final users
a20fd0a uwb: use the %pM formatting specifier in eda.c
8c165a8 infiniband: remove IPOIB_GID_RAW_ARG, IPOIB_GID_ARG, IPOIB_GID_FMT
fcace2f infiniband: ipoib replace IPOIB_GID_FMT with %p6
8867cd7 infiniband: use %p6 for printing message ids
b3020061 vlan: propogate ethtool speed values
3717746 veth: remove unused list
bb7bba3 veth: Remove useless veth field
fdb46ee net, misc: replace uses of NIP6_FMT with %p6
0c6ce78 net: replace uses of NIP6_FMT with %p6
38ff4fa netfilter: replace uses of NIP6_FMT with %p6
1afa67f misc: replace NIP6_FMT with %p6 format specifier
b071195 net: replace all current users of NIP6_SEQFMT with %#p6
689afa7 printk: add %p6 format specifier for IPv6 addresses
3a2dfbe xfrm: Notify changes in UDP encapsulation via netlink
93adcc8 net: don't use INIT_RCU_HEAD
def8b4f net: reduce structures when XFRM=n
b057efd netlink: constify struct nlattr * arg to parsing functions
ad38dab x86: use the new byteorder headers
d4f1b10 x86: clean up comments wrt. rd{msr|tsc|pmc}
2011a06 Merge commit 'v2.6.28-rc2' into x86/doc
30604bb x86: break up mtrr_cleanup() into several small functions.
7a9787e Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
163d4c5 Merge branch 'topic/fix/hda' into topic/hda
34c2535 ALSA: hda - Remove old codec-probe limitation
15ad9a5 Merge branch 'topic/fix/asoc' into topic/asoc
3891845 netns: Coexist with the sysfs limitations v2
7c510e4 net: convert more to %pM
e174961 net: convert print_mac to %pM
0c68ae2 mac80211: convert to %pM away from print_mac
dd45c9c printk: add %pM format specifier for MAC addresses
1080d70 net: implement emergency route cache rebulds when gc_elasticity is
exceeded
69a72a0 x86/uv: update SCIR driver to use the idle_cpu() function
878719e x86: unify appropriate bits from dumpstack_32 and dumpstack_64
7d5a78c x86, NMI watchdog: disable NMIs on LVT0 in case NMI watchdog is not
working
6f290b4 x86, NMI watchdog: add support to enable and disable IOAPIC NMI
b43d196 x86: corruption-check: some post-move cleanups
304e629 x86: corruption check: run the corruption checks from a work queue
6784f7d x86: corruption check: move the corruption checks into their own file
04d2aac x86: corruption-check: fix some style issues
944ac42 ftrace: ftrace dump on oops control
c63dfef x86: remove dead IRQBALANCE code
fd4a203 x86: signal_64.c: get_stack() doesn't need entire regs
709110b x86: signal: cosmetic unification of restore_sigcontext()
fd3fdf1 trace: add the MMIO-tracer to the tracer menu, cleanup
5d9881e markers: break the redundant loop in kernel/marker.c
4de6274 markers: let marker_table be close to its comments
505e371 markers: remove exported symbol marker_probe_cb_noarg()
0eec481 markers: simplify marker_set_format()
7f1baa0 x86/uv: provide a System Activity Indicator driver
5292ae1 Merge commit 'v2.6.28-rc2' into x86/uv
f4a2a0d ftrace: add a script to produce a hierarchical view of a function
trace
8479d94 x86, signals: remove duplicated register setup code in ia32 signal
delivery
4fc85e4 Merge branch 'topic/misc-next' into topic/misc
911fc25 Merge branch 'topic/asoc-next' into topic/asoc
42dc237 Merge branch 'topic/hda-next' into topic/hda
74aeaab ALSA: hda: add support for jack detection on IDT codecs.
50a9f79 ALSA: hda: add snd_hda_get_jack* functions
a53ccab ALSA: jack: lineout support to jack abstraction layer
282cd76 ALSA: hda: dynamic jack id
bbaf5e9 ALSA: Add hrtimer backend for ALSA timer interface
63fb708 x86: change OPTIMIZE_INLINING help to say enabling makes smaller
kernels
67679b1 ALSA: emu10k1: fix coding style for emu10k1_main.c
888dcb7 ALSA: aoa: clean up file names
871d377 i386, dumpstack: unify die()
e06ca43 i386, dumpstack: use oops_begin/oops_end in die_nmi
e4955cf i386, dumpstack: use x86_64's method to account die_nest_count
10b14cb x86, dumpstack: always call oops_exit from oops_end
0ed7a49 x86_64, dumpstack: move kexec_crash from __die to oops_end
874d93d x86, dumpstack: let signr=0 signal no do_exit
b4b8f87 i386, dumpstack: move crash_kexec before bust_spinlocks(0) in oops_end
9e89981 x86, mm: enable GBPAGES option by default
b0f2098 x86, uv: use consistent names for region size and conherence id on
x86 and ia64
718a259 ALSA: emu10k1: fix faulty commit 18c71092
18c7109 ALSA: emu10k1: fix device names for Live!/Audigy1/2/4/E-mu
1083206 ALSA: ice1724 - Fix TX IRQ lockup
c872e8c ALSA: Enable SPDIF output on ALC655
96c7d47 ALSA: pcsp - Fix locking messes in snd-pcsp
ebaa047 ALSA: hda - Release jack instance for dynamic reconfigure
dd125b2 Merge branch 'topic/hda-reconfig' into topic/hda-next
76a4d10 ALSA: Print function symbol in the error messages
6b93311 ALSA: ASoC: Remove snd_soc_dapm_connect_input()
8ae6a55 ALSA: ASoC: Convert wm8900 to a new-style i2c driver
17be552 ALSA: ASoC: Convert wm8580 to a new-style i2c driver
45a6ac1 ALSA: hda: add support for jack detection on IDT/Sigmatel
1e1be43 ALSA: hda - Add hints for reconfig
11aeff0 ALSA: hda - Add init_verbs entries
d7ffba1 ALSA: hda - Add sysfs entries to hwdep devices
6c1f45e ALSA: hda - Add codec reconfiguration feature
d13bd41 ALSA: hda - Manage kcontrol lists
f44ac83 ALSA: hda - Allocate name string of each codec
603c401 ALSA: hda - Use generic array helpers
b2e1859 ALSA: hda - Add generic arrays
176d533 ALSA: hda - Add infrastructure for dynamic stream allocation
41b9eb2 x86, pci: introduce config option for pci reroute quirks (was: [PATCH
0/3] Boot IRQ quirks for Broadcom and AMD/ATI)
3e370b2 Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
88d1dce PCI quirks: call boot IRQ quirks at end of device init and during
resume
542622d PCI quirks: disable AMD/ATI legacy boot interrupt generation
7725118 PCI quirks: add quirk to disable boot interrupt generation on
broadcom HT1000
dbbcfb2 Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
b0356cd pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent,
warning fix
33be833 x86: boot IRQ quirks and rerouting, fix
e1d3a90 pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent
426b3b8 pci: add quirk to disable boot interrupt generation on intel 6300ESB
9197979 x86, pci: introduce pci=ioapicreroute kernel cmdline option
a9322f6 x86, pci: introduce pci=noioapicquirk kernel cmdline option
747ada3 pci: add PCI IDs for devices that need boot irq quirks
from 3d44cc3e01ee1b40317f79ed54324e25c4f848df (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3c92ec8ae91ecf59d88c798301833d7cf83f2179
Merge: c4c9f0183b7c4e97836e8fecbb67898b06c47e78
ca9153a3a2a7556d091dfe080e42b0e67881fff6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 16:54:33 2008 -0800
Merge branch 'next' of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
(144 commits)
powerpc/44x: Support 16K/64K base page sizes on 44x
powerpc: Force memory size to be a multiple of PAGE_SIZE
powerpc/32: Wire up the trampoline code for kdump
powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
powerpc/32: Setup OF properties for kdump
powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
powerpc: Prepare xmon_save_regs for use with kdump
powerpc: Remove default kexec/crash_kernel ops assignments
powerpc: Make default kexec/crash_kernel ops implicit
powerpc: Setup OF properties for ppc32 kexec
powerpc/pseries: Fix cpu hotplug
powerpc: Fix KVM build on ppc440
powerpc/cell: add QPACE as a separate Cell platform
powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
powerpc/mpc5200: fix error paths in PSC UART probe function
powerpc/mpc5200: add rts/cts handling in PSC UART driver
powerpc/mpc5200: Make PSC UART driver update serial errors counters
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
...
Fix trivial conflict in drivers/char/Makefile as per Paul's directions
commit c4c9f0183b7c4e97836e8fecbb67898b06c47e78
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon Dec 29 10:46:13 2008 +1100
net: ehea NAPI interface cleanup fix
Commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused
netdev arg from some NAPI interfaces") missed two spots.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit bf66542bef3771a42ad3b1d5dc503c804bc22b33
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed Dec 3 13:49:23 2008 +1100
cifs: update for new IP4/6 address printing
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit d05a788f2279056a518d412c6391322ef11366e0
Merge: 96faec945f39cab38403f60f515bff43660b4dab
54d2f649a67109d877ca143c09cdeba61fe51bcf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 15:15:08 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
smackfs: check for allocation failures in smk_set_access()
commit 96faec945f39cab38403f60f515bff43660b4dab
Merge: 2926328554fa740518e2a6585b2cefb01e5f65f3
9bb482476c6c9d1ae033306440c51ceac93ea80c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 15:13:48 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (25
commits)
allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
kbuild: strip generated symbols from *.ko
kbuild: simplify use of genksyms
kernel-doc: check for extra kernel-doc notations
kbuild: add headerdep used to detect inclusion cycles in header files
kbuild: fix string equality testing in tags.sh
kbuild: fix make tags/cscope
kbuild: fix make incompatibility
kbuild: remove TAR_IGNORE
setlocalversion: add git-svn support
setlocalversion: print correct subversion revision
scripts: improve the decodecode script
scripts/package: allow custom options to rpm
genksyms: allow to ignore symbol checksum changes
genksyms: track symbol checksum changes
tags and cscope support really belongs in a shell script
kconfig: fix options to check-lxdialog.sh
kbuild: gen_init_cpio expands shell variables in file names
remove bashisms from scripts/extract-ikconfig
kbuild: teach mkmakfile to be silent
...
commit 2926328554fa740518e2a6585b2cefb01e5f65f3
Merge: 541ef5cbb8e68189d47272cea52a69abc30259bc
8587b33f4adee4e7614ea7f443346c3b6bb5427a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 15:12:35 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram:
[PATCH] nvram - convert PRINT_PROC to seq_file
[PATCH] nvram - CodingStyle
commit 54d2f649a67109d877ca143c09cdeba61fe51bcf
Merge: 541ef5cbb8e68189d47272cea52a69abc30259bc
81ea714bf148fce35e931edcbdfd3aedda20d1dc
Author: James Morris <jmorris@xxxxxxxxx>
Date: Mon Dec 29 09:57:38 2008 +1100
Merge branch 'next' into for-linus
commit ca9153a3a2a7556d091dfe080e42b0e67881fff6
Author: Ilya Yanok <yanok@xxxxxxxxxxx>
Date: Thu Dec 11 04:55:41 2008 +0300
powerpc/44x: Support 16K/64K base page sizes on 44x
This adds support for 16k and 64k page sizes on PowerPC 44x processors.
The PGDIR table is much smaller than a page when using 16k or 64k
pages (512 and 32 bytes respectively) so we allocate the PGDIR with
kzalloc() instead of __get_free_pages().
One PTE table covers rather a large memory area when using 16k or 64k
pages (32MB or 512MB respectively), so we can easily put FIXMAP and
PKMAP in the area covered by one PTE table.
Signed-off-by: Yuri Tikhonov <yur@xxxxxxxxxxx>
Signed-off-by: Vladimir Panfilov <pvr@xxxxxxxxxxx>
Signed-off-by: Ilya Yanok <yanok@xxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6ca4f7494bde078b2b730e28e4ea1dc36a772f70
Author: Hollis Blanchard <hollisb@xxxxxxxxxx>
Date: Wed Nov 26 10:19:26 2008 -0600
powerpc: Force memory size to be a multiple of PAGE_SIZE
Ensure that total memory size is page-aligned, because otherwise
mark_bootmem() gets upset.
This error case was triggered by using 64 KiB pages in the kernel
while arch/powerpc/boot/4xx.c arbitrarily reduced the amount of memory
by 4096 (to work around a chip bug that affects the last 256 bytes of
physical memory).
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 541ef5cbb8e68189d47272cea52a69abc30259bc
Merge: 0191b625ca5a46206d2fb862bb08f36f2fcb3b31
aa6eeeef78263e9891185c6cfaaf64808460a54a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:54:07 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: use the new byteorder headers
fbcon: Protect free_irq() by MACH_IS_ATARI check
fbcon: remove broken mac vbl handler
m68k: fix trigraph ignored warning in setox.S
macfb annotations and compiler warning fix
m68k: mac baboon interrupt enable/disable
m68k: machw.h cleanup
m68k: Mac via cleanup and commentry
m68k: Reinstate mac rtc
commit 0191b625ca5a46206d2fb862bb08f36f2fcb3b31
Merge: 54a696bd07c14d3b1192d03ce7269bc59b45209a
eb56092fc168bf5af199d47af50c0d84a96db898
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:49:40 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429
commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising
bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
commit 54a696bd07c14d3b1192d03ce7269bc59b45209a
Merge: 1d248b2593e92db6c51ca07235985a95c625a93f
359d67d6ad054ae11ad459665fdfb883aca87782
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:37:14 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (31
commits)
[CIFS] Remove redundant test
[CIFS] make sure that DFS pathnames are properly formed
Remove an already-checked error condition in SendReceiveBlockingLock
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
[CIFS] Streamline SendReceive[2] by using "goto out:" in an error
condition
Slightly streamline SendReceive[2]
Check the return value of cifs_sign_smb[2]
[CIFS] Cleanup: Move the check for too large R/W requests
[CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary
"else" branch
Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
[CIFS] In SendReceive, move consistency check out of the mutexed region
cifs: store password in tcon
cifs: have calc_lanman_hash take more granular args
cifs: zero out session password before freeing it
cifs: fix wait_for_response to time out sleeping processes correctly
[CIFS] Can not mount with prefixpath if root directory of share is
inaccessible
[CIFS] various minor cleanups pointed out by checkpatch script
[CIFS] fix typo
[CIFS] remove sparse warning
...
Fix trivial conflict in fs/cifs/cifs_fs_sb.h due to comment changes for
the CIFS_MOUNT_xyz bit definitions between cifs updates and security
updates.
commit 1d248b2593e92db6c51ca07235985a95c625a93f
Merge: 1db2a5c11e495366bff35cf7445d494703f7febe
2a0d8366dde9c66d8f481bee56828b661e5c8bf1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:33:59 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
RDMA/nes: Remove tx_free_list
RDMA/cma: Add IPv6 support
RDMA/addr: Add support for translating IPv6 addresses
mlx4_core: Delete incorrect comment
mlx4_core: Add support for multiple completion event vectors
IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
IB/ehca: Remove redundant test of vpage
IB/ehca: Replace modulus operations in flush error completion path
IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
IB/ipath: Fix spi_pioindex value
IB/ipath: Only do 1X workaround on rev1 chips
IB/ipath: Don't count IB symbol and link errors unless link is UP
IB/ipath: Check return value of dma_map_single()
IB/ipath: Fix PSN of send WQEs after an RDMA read resend
RDMA/nes: Cleanup warnings
RDMA/nes: Add loopback check to make_cm_node()
RDMA/nes: Check cqp_avail_reqs is empty after locking the list
RDMA/nes: Fix TCP compliance test failures
RDMA/nes: Forward packets for a new connection with stale APBVT entry
...
commit 1db2a5c11e495366bff35cf7445d494703f7febe
Merge: a39b863342b8aba52390092be95db58f6ed56061
cef7125def4dd104769f400c941199614da0aca1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:33:21 2008 -0800
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (85
commits)
[S390] provide documentation for hvc_iucv kernel parameter.
[S390] convert ctcm printks to dev_xxx and pr_xxx macros.
[S390] convert zfcp printks to pr_xxx macros.
[S390] convert vmlogrdr printks to pr_xxx macros.
[S390] convert zfcp dumper printks to pr_xxx macros.
[S390] convert cpu related printks to pr_xxx macros.
[S390] convert qeth printks to dev_xxx and pr_xxx macros.
[S390] convert sclp printks to pr_xxx macros.
[S390] convert iucv printks to dev_xxx and pr_xxx macros.
[S390] convert ap_bus printks to pr_xxx macros.
[S390] convert dcssblk and extmem printks messages to pr_xxx macros.
[S390] convert monwriter printks to pr_xxx macros.
[S390] convert s390 debug feature printks to pr_xxx macros.
[S390] convert monreader printks to pr_xxx macros.
[S390] convert appldata printks to pr_xxx macros.
[S390] convert setup printks to pr_xxx macros.
[S390] convert hypfs printks to pr_xxx macros.
[S390] convert time printks to pr_xxx macros.
[S390] convert cpacf printks to pr_xxx macros.
[S390] convert cio printks to pr_xxx macros.
...
commit a39b863342b8aba52390092be95db58f6ed56061
Merge: b0f4b285d7ed174804658539129a834270f4829a
4e202284e6ac1695df3eb4a0e549ea78addfb663
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:27:58 2008 -0800
Merge branch 'sched-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
sched: fix warning in fs/proc/base.c
schedstat: consolidate per-task cpu runtime stats
sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
sched, cpuacct: export percpu cpuacct cgroup stats
sched, cpuacct: refactoring cpuusage_read / cpuusage_write
sched: optimize update_curr()
sched: fix wakeup preemption clock
sched: add missing arch_update_cpu_topology() call
sched: let arch_update_cpu_topology indicate if topology changed
sched: idle_balance() does not call load_balance_newidle()
sched: fix sd_parent_degenerate on non-numa smp machine
sched: add uid information to sched_debug for CONFIG_USER_SCHED
sched: move double_unlock_balance() higher
sched: update comment for move_task_off_dead_cpu
sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares
sched/rt: removed unneeded defintion
sched: add hierarchical accounting to cpu accounting controller
sched: include group statistics in /proc/sched_debug
sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER
sched: clean up SCHED_CPUMASK_ALLOC
...
commit b0f4b285d7ed174804658539129a834270f4829a
Merge: be9c5ae4eeec2e85527e95647348b8ea4eb25128
5250d329e38cdf7580faeb9c53c17d3588d7d19c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:21:10 2008 -0800
Merge branch 'tracing-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits)
sched, trace: update trace_sched_wakeup()
tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
Revert "x86: disable X86_PTRACE_BTS"
ring-buffer: prevent false positive warning
ring-buffer: fix dangling commit race
ftrace: enable format arguments checking
x86, bts: memory accounting
x86, bts: add fork and exit handling
ftrace: introduce tracing_reset_online_cpus() helper
tracing: fix warnings in kernel/trace/trace_sched_switch.c
tracing: fix warning in kernel/trace/trace.c
tracing/ring-buffer: remove unused ring_buffer size
trace: fix task state printout
ftrace: add not to regex on filtering functions
trace: better use of stack_trace_enabled for boot up code
trace: add a way to enable or disable the stack tracer
x86: entry_64 - introduce FTRACE_ frame macro v2
tracing/ftrace: add the printk-msg-only option
tracing/ftrace: use preempt_enable_no_resched_notrace in
ring_buffer_time_stamp()
x86, bts: correctly report invalid bts records
...
Fixed up trivial conflict in scripts/recordmcount.pl due to SH bits
being already partly merged by the SH merge.
commit be9c5ae4eeec2e85527e95647348b8ea4eb25128
Merge: bb26c6c29b7cc9f39e491b074b09f3c284738d36
79a66b96c339626a3e4b226fefc0e45244cfe6ff
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:07:57 2008 -0800
Merge branch 'x86-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
x86: PAT: fix address types in track_pfn_vma_new()
x86: prioritize the FPU traps for the error code
x86: PAT: pfnmap documentation update changes
x86: PAT: move track untrack pfnmap stubs to asm-generic
x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
x86: PAT: modify follow_phys to return phys_addr prot and return value
x86: PAT: clarify is_linear_pfn_mapping() interface
x86: ia32_signal: remove unnecessary declaration
x86: common.c boot_cpu_stack and boot_exception_stacks should be static
x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
x86: fix warning in arch/x86/kernel/microcode_amd.c
x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
x86: asm-offset_64: use rt_sigframe_ia32
x86: sigframe.h: include headers for dependency
x86: traps.c declare functions before they get used
x86: PAT: update documentation to cover pgprot and remap_pfn related
changes - v3
x86: PAT: add pgprot_writecombine() interface for drivers - v3
x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
...
commit bb26c6c29b7cc9f39e491b074b09f3c284738d36
Merge: e14e61e967f2b3bdf23f05e4ae5b9aa830151a44
cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:43:54 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
(105 commits)
SELinux: don't check permissions for kernel mounts
security: pass mount flags to security_sb_kern_mount()
SELinux: correctly detect proc filesystems of the form "proc/foo"
Audit: Log TIOCSTI
user namespaces: document CFS behavior
user namespaces: require cap_set{ug}id for CLONE_NEWUSER
user namespaces: let user_ns be cloned with fairsched
CRED: fix sparse warnings
User namespaces: use the current_user_ns() macro
User namespaces: set of cleanups (v2)
nfsctl: add headers for credentials
coda: fix creds reference
capabilities: define get_vfs_caps_from_disk when file caps are not enabled
CRED: Allow kernel services to override LSM settings for task actions
CRED: Add a kernel_service object class to SELinux
CRED: Differentiate objective and effective subjective credentials on a
task
CRED: Documentation
CRED: Use creds in file structs
CRED: Prettify commoncap.c
CRED: Make execve() take advantage of copy-on-write credentials
...
commit e14e61e967f2b3bdf23f05e4ae5b9aa830151a44
Merge: cb10ea549fdc0ab2dd8988adab5bf40b4fa642f3
0ee4a96902dd7858e65f378c86f428a0355bd841
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:43:22 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (57
commits)
crypto: aes - Precompute tables
crypto: talitos - Ack done interrupt in isr instead of tasklet
crypto: testmgr - Correct comment about deflate parameters
crypto: salsa20 - Remove private wrappers around various operations
crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
crypto: sha512 - Switch to shash
crypto: sha512 - Move message schedule W[80] to static percpu area
crypto: michael_mic - Switch to shash
crypto: wp512 - Switch to shash
crypto: tgr192 - Switch to shash
crypto: sha256 - Switch to shash
crypto: md5 - Switch to shash
crypto: md4 - Switch to shash
crypto: sha1 - Switch to shash
crypto: rmd320 - Switch to shash
crypto: rmd256 - Switch to shash
crypto: rmd160 - Switch to shash
crypto: rmd128 - Switch to shash
crypto: null - Switch to shash
crypto: hash - Make setkey optional
...
commit cb10ea549fdc0ab2dd8988adab5bf40b4fa642f3
Merge: 81d6e59dabb1ae0c782e9eb7e3d88f699d25b314
5ce442fe2c9423ec5451222aee6f9b2127bb8311
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:41:32 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (367 commits)
ALSA: ASoC: fix a typo in omp-pcm.c
ASoC: Fix DSP formats in SSM2602 audio codec
ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
ALSA: hda: fix incorrect mixer index values for 92hd83xx
ALSA: hda: dinput_mux check
ALSA: hda - Add quirk for another HP dv7
ALSA: ASoC - Add missing __devexit annotation to wm8350.c
ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
ALSA: ASoC: tlv320aic3x add dsp_a
ALSA: ASoC: DaVinci: document I2S limitations
ALSA: ASoC: DaVinci: davinci-i2s clean up
ALSA: ASoC: DaVinci: davinci-i2s clean up
ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
ALSA: ca0106 - disable 44.1kHz capture
ALSA: ca0106 - Add missing card->private_data initialization
ALSA: ca0106 - Check ac97 availability at PM
ALSA: hda - Power up always when no jack detection is available
ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
...
commit 81d6e59dabb1ae0c782e9eb7e3d88f699d25b314
Merge: 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
59de580af1c2fd671b0cb27c41ff958859ae5288
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:39:19 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (132 commits)
sh: oprofile: Fix up the module build.
sh: add UIO support for JPU on SH7722.
serial: sh-sci: Fix up port pinmux for SH7366.
sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
sh: mach-sh03: Fix up pata_platform build breakage.
sh: enable deferred io LCDC on Migo-R
video: sh_mobile_lcdcfb deferred io support
video: deferred io with physically contiguous memory
video: deferred io cleanup
video: fix deferred io fsync()
sh: add LCDC interrupt configuration to AP325 and Migo-R
sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
sh: split coherent pages
sh: dma: Kill off ISA DMA wrapper.
sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
sh: Kill off the unused SH_ALPHANUMERIC debug option.
sh: Enable skipping of bss on debug platforms for sh32 also.
doc: Update sh cpufreq documentation.
sh: mrshpc_setup_windows() needs to be inline.
serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL.
...
commit aa6eeeef78263e9891185c6cfaaf64808460a54a
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Tue Nov 18 20:45:23 2008 +0100
m68k: use the new byteorder headers
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 7f877ebb32ac9a4b0783e825cef84c6ace87fe90
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:23 2008 +0100
fbcon: Protect free_irq() by MACH_IS_ATARI check
Add missing check for Atari in free_irq() call, which could cause problems
on
multi-platform m68k kernels.
Reported-by: Brad Boyer <flar@xxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 79f0c9a0479060e3a8607d93bc8d81ff962acc87
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:23 2008 +0100
fbcon: remove broken mac vbl handler
Remove the Mac VBL interrupt code as it doesn't work properly and
doesn't bring any benefit when fixed. Also remove unused
DEFAULT_CURSOR_BLINK_RATE macro and irqres variable.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 646819e86222cc06b85ed2a8dafbbb361a05ea2d
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:22 2008 +0100
m68k: fix trigraph ignored warning in setox.S
Fix the warning: trigraph ??/ ignored, use -trigraphs to enable
caused by the recent removal of -traditional option.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 3839d01d61195d76d53943ac36b603d7e7ca4b6e
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:22 2008 +0100
macfb annotations and compiler warning fix
Add some __iomem annotations. Remove some volatile qualifiers to fix
several compiler warnings: "passing arg 1 of `iounmap' discards qualifiers
from pointer target type".
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 746e8d3b223281f0e5472ab0ad8f59af2221ea9b
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:21 2008 +0100
m68k: mac baboon interrupt enable/disable
No-one seems to know how to mask individual baboon interrupts, so we just
mask the umbrella IRQ. This will work as long as only the IDE driver uses
the baboon chip (it can't deadlock). Use mac_enable_irq/mac_disable_irq
rather than enable_irq/disable_irq because the latter routines count the
depth of nested calls which triggers a warning and call trace because
IRQ_NUBUS_C is enabled twice in a row (once when the baboon handler is
registered, and once when the IDE IRQ is registered).
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 429dbf53bca49b110f1058f0d9417a59115c41b8
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:20 2008 +0100
m68k: machw.h cleanup
Remove some more cruft from machw.h and drop the #include where it isn't
needed.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 4a973592d67ccc240bca694e48ce88facd764043
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:20 2008 +0100
m68k: Mac via cleanup and commentry
No behavioural changes, just cleanups and better documentation.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 40f7f9c1c22aef049ed7339d9e45624aa980a1a0
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:20 2008 +0100
m68k: Reinstate mac rtc
Reinstate the Mac hardware clock for CUDA ADB and Mac II ADB models.
It doesn't work properly on Mac IIsi ADB and PMU ADB yet, so leave them
out.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit eb56092fc168bf5af199d47af50c0d84a96db898
Author: Dave Jones <davej@xxxxxxxxxx>
Date: Sat Dec 27 20:43:48 2008 -0800
net: Allow dependancies of FDDI & Tokenring to be modular.
I noticed it isn't possible to build token ring & fddi drivers
without causing LLC, and a bunch of other things to be forced
built-in. For distro kernels, this means carrying a chunk of
code in the vmlinuz, even if the user doesn't use those protocols.
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8d25332081d87491e3b12fa130539fe9e2ba4a94
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 26 15:13:55 2008 -0800
igb: Fix build warning when DCA is disabled.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2d5451d2614583de0c9aaf61cf5f77faf5694105
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 26 15:10:00 2008 -0800
net: Fix warning fallout from recent NAPI interface changes.
When we removed the network device argument from several
NAPI interfaces in 908a7a16b852ffd618a9127be8d62432182d81b4
("net: Remove unused netdev arg from some NAPI interfaces.")
several drivers now started getting unused variable warnings.
This fixes those up.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0da2afd59653d2edf5c8e0f09b23f367ab5bc80f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 26 14:57:42 2008 -0800
gro: Fix potential use after free
The initial skb may have been freed after napi_gro_complete in
napi_gro_receive if it was merged into an existing packet. Thus
we cannot check same_flow (which indicates whether it was merged)
after calling napi_gro_complete.
This patch fixes this by saving the same_flow status before the
call to napi_gro_complete.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 843813453f52e3378fc988c8364063fd4cb9d0e3
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:49:25 2008 -0800
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
When AN is enabled and the link is down the speed/duplex control bits
will not be meaningful. Use the advertising bits instead, and mask
them with the LPA bits if and only if AN is complete (as before).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4bd954e7c24063b15fa9abc8b4b1242772928ed
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:48:51 2008 -0800
sfc: When disabling the NIC, close the device rather than unregistering it
This should reduce user confusion and may also aid recovery (ioctls
will still be available).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 307505e9a4ce0b13b2f996385669039806e07390
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:48:00 2008 -0800
sfc: SFT9001: Add cable diagnostics
The SFT9001 firmware implements cable diagnostics; run those and
include their results in a self-test. In case of a cable fault, do
not fail the self-test as a whole; only faults in the NIC should cause
that.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1796721a5a691a5d392abf8070ad40a0b787b667
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:47:25 2008 -0800
sfc: Add support for multiple PHY self-tests
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2ef3068e6c40ec44d27f6f8027616e284d1b0466
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:47:04 2008 -0800
sfc: Merge top-level functions for self-tests
Pass in ethtool test flags to determine which tests to run.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a5692e49cd9e6512c48ebf61e52991cbe643c12d
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:46:38 2008 -0800
sfc: Clean up PHY mode management in loopback self-test
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit caa8d8bbddc9157cb8f34465be98fc83faf37155
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:46:12 2008 -0800
sfc: Fix unreliable link detection in some loopback modes
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6977dc6309ea8bbcb24c0a1356c33969e4a07410
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:44:39 2008 -0800
sfc: Generate unique names for per-NIC workqueues
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e727149e26b08550269a7786fda977aed65578f6
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:41:53 2008 -0800
802.3ad: use standard ethhdr instead of ad_header
802.3ad has its own ethhdr-like structure in the form of an ad_header,
which is at the start of both the LACPDU and marker PDU. Both are
the same from the struct values, both are packed as well.
It's therefore perfectly fine to replace the ad_header by the ethhdr
and to remove its definition.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4ac43200fd6b8b8de3b487e74e74d3742f70d79
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:40:48 2008 -0800
802.3ad: generalize out mac address initializer
Generalize out mac address initializer for the LACPDU multicast
address and use in two places. Remove the now unused
AD_MULTICAST_LACPDU_ADDR.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7addeef6b15c9b7cffaaf40ec5b5b0940145ec16
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:28:33 2008 -0800
802.3ad: initialize ports LACPDU from const initializer
Save some text by initializing ports LACPDU from const initializer,
then get rid of ad_initialize_lacpdu().
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 87f422f8618c541db0f96194cca9465817f76b89
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:27:57 2008 -0800
802.3ad: remove typedef around ad_system
As typedefs are considered a bad thing most of the time remove the
typedef around ad_system.
Signed-off-by: Holger Eitzenberger <heitzenberger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1624db7be0d9f77f5494efe1b066d1d44b46c96c
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:27:21 2008 -0800
802.3ad: turn ports is_individual into a bool
Turn ports is_individual into a bool. There is no functional change.
Signed-off-by: Holger Eitzenberger <heitzenberger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f48127b6f3270cf7234a7a9f770533332e85e8ae
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:26:54 2008 -0800
802.3ad: turn ports is_enabled into a bool
Turn ports is_enabled into a bool. There is no functional change.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d238d458a70ad134cb421c3ffc66242277f30dda
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 11:18:15 2008 -0800
802.3ad: make ntt bool
Turn Need-To-Transmit port variable into a bool. There is no
functional change.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d3fa4721456226d77475181a4bfbe5b3d899d65c
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Fri Dec 26 01:36:33 2008 -0800
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
The adapter rings are kcalloc()'d, but in set_ringparam() in ixgbe_ethtool,
we replace that memory from the vmalloc() pool. This can result in a NULL
pointer reference when trying to modify the rings at a later time, or on
device removal.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7adf1525befb5606462431eb1a4ea40ded5baef4
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Fri Dec 26 01:36:05 2008 -0800
ixgbe: Fix NAPI enable/disable path when using DCB
This change allows DCB mode to change the number of queues, and presumably
the number of NAPI instances, safely.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d7b06636be162d3f74c9ce5d6d0d9ea4e5d362c8
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Fri Dec 26 01:35:35 2008 -0800
net: Init NAPI dev_list on napi_del
The recent GRO patches introduced the NAPI removal of devices in
free_netdev. For drivers that can change the number of queues during
driver operation, the NAPI infrastructure doesn't allow the freeing and
re-addition of NAPI entities without reloading the driver.
This change reinitializes the dev_list in each NAPI struct on delete,
instead of just deleting it (and assigning the list pointers to POISON).
Drivers that wish to remove/re-add NAPI will need to re-initialize the
netdev napi_list after removing all NAPI instances, before re-adding NAPI
devices again.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 26bc19ecf6c077c926827c25631340fd2e8fb16e
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Fri Dec 26 01:34:11 2008 -0800
igb: re-order queues to support cleaner use of ivar on 82576
The 82576 adapter orders the queues in pairs when virtualization is in use.
The queue ordering previously conflicted with the ordering when sr-iov was
enabled. This new ordering allows a PF to allocate 2 queues without using
any VF resources.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e014cb16234c3797aa518d46fe7e1fe91ebcca9
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Fri Dec 26 01:33:18 2008 -0800
igb: defeature tx head writeback
This patch removes tx head writeback as it was found to not provide a
significant improvement in tx performance and on some systems has been seen
to cause a performance degredation due to partial cache line writes.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f2712fd0b4097e8385bdb75c0ebd285a057fe299
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 26 01:31:18 2008 -0800
ipsec: Remove useless ret variable
This patch removes a useless ret variable from the IPv4 ESP/UDP
decapsulation code.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fdb614c28487df41f7bf2c98e85f29f31885561e
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 23 06:59:25 2008 +0000
ucc_geth: Eliminate the need for forward references
This patch simply reorders some functions to eliminate the need for
forward references. No other changes than that.
Suggested-by: Timur Tabi <timur@xxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9c54004ea717116a10886e254e26502ffb1136e9
Author: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Date: Tue Dec 23 04:09:02 2008 +0000
atm: Driver for Solos PCI ADSL2+ card.
This adds basic support for the 'Solos' PCI ADSL2+ cards being developed
by Traverse Technologies and Xrio Ltd:
http://www.traverse.com.au/productview.php?product_id=116
Signed-off-by: Nathan Williams <nathan@xxxxxxxxxxxxxxx>
Signed-off-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 236b87c29953a87a6817e96e311b0efd00e95dc7
Author: Tilman Schmidt <tilman@xxxxxxx>
Date: Fri Dec 26 01:22:03 2008 -0800
gigaset: ifdef cleanup
Remove unnecessary #ifdef-s and #if-0-ed code sections.
Signed-off-by: Tilman Schmidt <tilman@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c8770dcabd6a615b155c25dc4d57251d3e7f151c
Author: Tilman Schmidt <tilman@xxxxxxx>
Date: Fri Dec 26 01:21:29 2008 -0800
gigaset: use pr_err() and pr_info()
Switch from private printk wrapper macros to using pr_err() and
pr_info() from linux/kernel.h, at the same time unifying a few
error messages.
Signed-off-by: Tilman Schmidt <tilman@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4d8cd002602987ddc9507b5390800343f820ac92
Author: Divy Le Ray <divy@xxxxxxxxxxx>
Date: Fri Dec 26 01:16:39 2008 -0800
cxgb3: add control to access embedded images
Update contol path between cxgb3 and ULP modules (iWARP, iSCSI)
to provide access to firware and protocol engine info.
Signed-off-by: Divy Le Ray <divy@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6dd014808f91ad99d4d794cf7c7c69610c10f904
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:15:03 2008 -0800
drivers/net/wireless/prism54: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/prism54/islpci_hotplug.c:97:1: warning: symbol
'prism54_probe' was not declared. Should it be static?
drivers/net/wireless/prism54/islpci_hotplug.c:220:1: warning: symbol
'prism54_remove' was not declared. Should it be static?
drivers/net/wireless/prism54/islpci_hotplug.c:263:1: warning: symbol
'prism54_suspend' was not declared. Should it be static?
drivers/net/wireless/prism54/islpci_hotplug.c:286:1: warning: symbol
'prism54_resume' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a3d1fd23e1ff2deeda0415805cf9a044dda7f55c
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:14:41 2008 -0800
drivers/net/wireless/ipw2x00: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/ipw2x00/ipw2100.c:5271:6: warning: symbol
'ipw2100_queues_initialize' was not declared. Should it be static?
drivers/net/wireless/ipw2x00/ipw2100.c:5278:6: warning: symbol
'ipw2100_queues_free' was not declared. Should it be static?
drivers/net/wireless/ipw2x00/ipw2100.c:5285:5: warning: symbol
'ipw2100_queues_allocate' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 11ab72a7c94f3ccac05b85928875fdc4f1ed5e9b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:13:46 2008 -0800
drivers/net/wireless/b43: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/b43/phy_a.c:80:6: warning: symbol
'b43_radio_set_tx_iq' was not declared. Should it be static?
drivers/net/wireless/b43/phy_a.c:150:6: warning: symbol
'b43_radio_init2060' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:57:10: warning: symbol
'b43_radio_channel_codes_bg' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:218:6: warning: symbol
'b43_set_txpower_g' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:386:6: warning: symbol
'b43_nrssi_hw_write' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:393:5: warning: symbol
'b43_nrssi_hw_read' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:404:6: warning: symbol
'b43_nrssi_hw_update' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:418:6: warning: symbol
'b43_nrssi_mem_update' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:592:6: warning: symbol
'b43_calc_nrssi_slope' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:1357:5: warning: symbol
'b43_radio_init2050' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bf512bc827c84f77553538834fffe71604079f23
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:13:29 2008 -0800
drivers/net/wireless/ath9k: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/ath9k/eeprom.c:195:6: warning: symbol
'ath9k_fill_eeprom' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:463:5: warning: symbol
'ath9k_check_eeprom' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:1219:6: warning: symbol
'ath9k_hw_set_def_power_per_rate_table' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:1510:6: warning: symbol
'ath9k_hw_set_4k_power_per_rate_table' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2007:5: warning: symbol
'ath9k_set_txpower' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2106:6: warning: symbol
'ath9k_set_addac' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2543:6: warning: symbol
'ath9k_eeprom_set_board_values' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2606:5: warning: symbol
'ath9k_get_eeprom_antenna_cfg' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2622:4: warning: symbol
'ath9k_hw_get_4k_num_ant_config' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2628:4: warning: symbol
'ath9k_hw_get_def_num_ant_config' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2647:4: warning: symbol
'ath9k_get_num_ant_config' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2790:5: warning: symbol
'ath9k_get_eeprom' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2ed5ba890e1e8dda89557e4ea233a26ab8bf3d58
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:12:59 2008 -0800
drivers/net/wireless: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/airo.c:3610:6: warning: symbol 'mpi_receive_802_11'
was not declared. Should it be static?
drivers/net/wireless/atmel.c:3183:6: warning: symbol 'atmel_join_bss' was
not declared. Should it be static?
drivers/net/wireless/ray_cs.c:831:5: warning: symbol 'ray_dev_init' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 62c5345db704c912b485f6b60dab381c9cebf268
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:12:08 2008 -0800
drivers/net/wan/z85230.c: fix sparse warnings: un-EXPORT symbols
The symbols are only references within the translation unit they are
defined in, so un-EXPORT them und make them 'static'.
Fix this sparse warnings:
drivers/net/wan/z85230.c:604:25: warning: symbol 'z8530_dma_sync' was not
declared. Should it be static?
drivers/net/wan/z85230.c:613:25: warning: symbol 'z8530_txdma_sync' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7b3dfa11cdef38bda07b99991f2f88c86df67ed2
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:11:21 2008 -0800
drivers/net/wan: fix sparse warning: make symbol static
Fix this sparse warning:
drivers/net/wan/x25_asy.c:623:5: warning: symbol 'x25_asy_esc' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d157e0230f205f5dd646c4e0985030367de7aa4c
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Mon Dec 22 09:17:55 2008 +0000
drivers/net/wan: fix sparse warnings: make do-while a compound statement
Fix this sparse warnings:
drivers/net/wan/wanxl.c:414:3: warning: do-while statement is not a
compound statement
drivers/net/wan/wanxl.c:441:3: warning: do-while statement is not a
compound statement
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ec1d1ebbb3bdc9807474be28c29efa155d15b850
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:07:45 2008 -0800
drivers/net/tulip: fix sparse warnings: make do-while a compound statement
Fix this sparse warnings:
drivers/net/tulip/de2104x.c:1695:4: warning: do-while statement is not a
compound statement
drivers/net/tulip/tulip_core.c:1433:5: warning: do-while statement is not
a compound statement
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 27cd6ae5619084f363630683e77d70be38075afe
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:07:15 2008 -0800
drivers/net/tokenring: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/tokenring/ibmtr.c:1840:6: warning: symbol 'tok_rerun' was not
declared. Should it be static?
drivers/net/tokenring/madgemc.c:469:16: warning: symbol
'madgemc_setnselout_pins' was not declared. Should it be static?
drivers/net/tokenring/proteon.c:286:16: warning: symbol
'proteon_setnselout_pins' was not declared. Should it be static?
drivers/net/tokenring/skisa.c:303:16: warning: symbol
'sk_isa_setnselout_pins' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 409b204435b85f7e159230c216f334a862cb3b95
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:06:28 2008 -0800
drivers/net/skfp: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/skfp/skfddi.c:620:13: warning: symbol 'skfp_interrupt' was
not declared. Should it be static?
drivers/net/skfp/skfddi.c:687:25: warning: symbol 'skfp_ctl_get_stats'
was not declared. Should it be static?
drivers/net/skfp/skfddi.c:1232:6: warning: symbol 'CheckSourceAddress'
was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2f22d22ea7e95d45353b790ac52975a42e3a8558
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:04:53 2008 -0800
drivers/net/qlge: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/qlge/qlge_ethtool.c:100:6: warning: symbol 'ql_update_stats'
was not declared. Should it be static?
drivers/net/qlge/qlge_mpi.c:22:5: warning: symbol 'ql_get_mb_sts' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f8057b7fefea1daca6928cbb95751d01fc934a41
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:04:26 2008 -0800
drivers/net/netxen: fix sparse warnings: use NULL pointer instead of plain
integer
Fix this sparse warnings:
drivers/net/netxen/netxen_nic_hw.c:1462:18: warning: Using plain integer
as NULL pointer
drivers/net/netxen/netxen_nic_hw.c:1536:18: warning: Using plain integer
as NULL pointer
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e855aac805dd9c68b6fabe395cbc8e05f0eda6e4
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:03:59 2008 -0800
drivers/net/ixgbe: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/ixgbe/ixgbe_82598.c:180:5: warning: symbol
'ixgbe_get_copper_link_capabilities_82598' was not declared. Should it be
static?
drivers/net/ixgbe/ixgbe_82598.c:245:5: warning: symbol
'ixgbe_setup_fc_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:729:5: warning: symbol
'ixgbe_set_vmdq_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:773:5: warning: symbol
'ixgbe_set_vfta_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:897:5: warning: symbol
'ixgbe_read_analog_reg8_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:919:5: warning: symbol
'ixgbe_write_analog_reg8_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:940:5: warning: symbol
'ixgbe_read_i2c_eeprom_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:1000:5: warning: symbol
'ixgbe_get_supported_physical_layer_82598' was not declared. Should it be
static?
drivers/net/ixgbe/ixgbe_dcb_82598.c:100:5: warning: symbol
'ixgbe_dcb_config_packet_buffers_82598' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e49e64526ccd8cb78d7c4b4a732024ff221d4d0
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:03:19 2008 -0800
drivers/net/irda: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/irda/ma600-sir.c:239:5: warning: symbol 'ma600_reset' was not
declared. Should it be static?
drivers/net/irda/smsc-ircc2.c:875:5: warning: symbol
'smsc_ircc_hard_xmit_sir' was not declared. Should it be static?
drivers/net/irda/smsc-ircc2.c:1131:6: warning: symbol
'smsc_ircc_set_sir_speed' was not declared. Should it be static?
drivers/net/irda/smsc-ircc2.c:1897:6: warning: symbol
'smsc_ircc_sir_start' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:150:5: warning: symbol 'w83977af_open' was
not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:313:5: warning: symbol 'w83977af_probe'
was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:412:6: warning: symbol
'w83977af_change_speed' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:492:5: warning: symbol
'w83977af_hard_xmit' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:734:5: warning: symbol
'w83977af_dma_receive' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:806:5: warning: symbol
'w83977af_dma_receive_complete' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 678c610b5a069a0a76c3189dd9aa801e5d5cd7e0
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:02:49 2008 -0800
drivers/net/igb: remove dead code (function 'igb_read_pci_cfg')
Fix this warning:
drivers/net/igb/e1000_mac.c:54: warning: 'igb_read_pci_cfg' defined but
not used
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5e4232ee5d7a1d2b2399e9080bf2f1a28444c80b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:01:18 2008 -0800
drivers/net/enic: fix sparse warning: make symbol static
Fix this sparse warning:
drivers/net/enic/vnic_dev.c:288:5: warning: symbol 'vnic_dev_capable' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fa4c16da738952882d51b265adbef1d8d329d50f
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Mon Dec 22 09:16:13 2008 +0000
drivers/net/e1000e: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/e1000e/es2lan.c:1265:5: warning: symbol
'e1000_read_kmrn_reg_80003es2lan' was not declared. Should it be static?
drivers/net/e1000e/es2lan.c:1298:5: warning: symbol
'e1000_write_kmrn_reg_80003es2lan' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit af8eca5cbbc8f991ec14c8d7e3350bbe2ea49655
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:59:28 2008 -0800
drivers/net/cxgb3: comment out dead code
The function 'vsc8211_set_speed_duplex' is not used, so comment it
out. For 'vsc8211_set_automdi' the function 'vsc8211_set_speed_duplex'
is the only caller, so comment it out as well.
Fix this (sparse) warning:
drivers/net/cxgb3/vsc8211.c:269: warning: 'vsc8211_set_automdi' defined
but not used
drivers/net/cxgb3/vsc8211.c:295:5: warning: symbol
'vsc8211_set_speed_duplex' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b06715b7a3db551dcf4706f05e8d2285a66fe05f
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:58:57 2008 -0800
drivers/net/bonding: fix sparse warnings: move decls to header file
Fix this sparse warnings:
drivers/net/bonding/bond_main.c:104:20: warning: symbol
'bonding_defaults' was not declared. Should it be static?
drivers/net/bonding/bond_main.c:204:22: warning: symbol 'ad_select_tbl'
was not declared. Should it be static?
drivers/net/bonding/bond_sysfs.c:60:21: warning: symbol 'bonding_rwsem'
was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9dc20f553f8cb548feaba9dae0cb4905327ecbac
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:58:35 2008 -0800
drivers/net/atlx: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/atlx/atl1.c:198:16: warning: symbol 'atl1_check_options' was
not declared. Should it be static?
drivers/net/atlx/atl1.c:526:5: warning: symbol 'atl1_read_mac_addr' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 888432f6720bec93ddae93c4d1483a18198a1b3b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:57:21 2008 -0800
drivers/net/arcnet: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/arcnet/capmode.c:64:6: warning: symbol 'arcnet_cap_init' was
not declared. Should it be static?
drivers/net/arcnet/com90xx.c:586:5: warning: symbol 'com90xx_reset' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dac499f912abd5838fa3501efdcd0f23d5f4fc29
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:56:45 2008 -0800
drivers/net: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/3c523.c:350:6: warning: symbol 'alloc586' was not declared.
Should it be static?
drivers/net/cs89x0.c:1029:14: warning: symbol 'reset_chip' was not
declared. Should it be static?
drivers/net/eepro.c:1399:1: warning: symbol 'read_eeprom' was not
declared. Should it be static?
drivers/net/plip.c:1020:5: warning: symbol 'plip_hard_header_cache' was
not declared. Should it be static?
drivers/net/s2io.c:5116:6: warning: symbol 'do_s2io_store_unicast_mc' was
not declared. Should it be static?
drivers/net/smc9194.c:767:12: warning: symbol 'smc_findirq' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a08b32df1417146b1a4c43e641ec1177da51896c
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:56:04 2008 -0800
drivers/net: fix sparse warning: returning void-valued expression
Fix this sparse warning:
drivers/net/niu.c:8850:2: warning: returning void-valued expression
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4c3c13cb4c4985cb62cf28677fc0ace69a8d69f
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:55:35 2008 -0800
drivers/net: fix sparse warnings: make do-while a compound statement
While at it insert some extra curly braces and fix formatting.
Fix this sparse warnings:
drivers/net/atp.c:811:8: warning: do-while statement is not a compound
statement
drivers/net/atp.c:813:8: warning: do-while statement is not a compound
statement
drivers/net/atp.c:815:11: warning: do-while statement is not a compound
statement
drivers/net/atp.c:817:11: warning: do-while statement is not a compound
statement
drivers/net/plip.c:642:4: warning: do-while statement is not a compound
statement
drivers/net/plip.c:647:4: warning: do-while statement is not a compound
statement
drivers/net/plip.c:820:4: warning: do-while statement is not a compound
statement
drivers/net/plip.c:825:4: warning: do-while statement is not a compound
statement
drivers/net/starfire.c:886:3: warning: do-while statement is not a
compound statement
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2705d4f87c068552f45e5d6feaa5c468a312f761
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:52:57 2008 -0800
drivers/net: fix sparse warning: use ANSI-style function declaration
Fix this sparse warning:
drivers/net/ne.c:932:24: warning: non-ANSI function declaration of
function 'init_module'
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d76e56b4c620c959fa8346c08d24ee4b2783a564
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Mon Dec 22 08:42:11 2008 +0000
ehea: use get_zeroed_page for alignment-sensitive allocation
With slub debug enabled, I see the following errors and crash with
2.6.28-rc9:
IBM eHEA ethernet device driver (Release EHEA_0095)
ehea: Error in ehea_h_register_rpage_mr: not on pageboundary
ehea: Error in ehea_reg_mr_section: register_rpage_mr failed
ehea: Error in ehea_reg_kernel_mr: registering mr failed
ehea: Error in ehea_setup_ports: creating MR failed
ehea 23c00100.lhea: setup_ports failed
Unable to handle kernel paging request for data at address
0x6b6b6b6b6b6bbdcb
Faulting instruction address: 0xd000000000064a24
cpu 0x0: Vector: 300 (Data Access) at [c0000000740e7190]
pc: d000000000064a24: .ehea_update_firmware_handles+0x84/0x47c [ehea]
lr: d00000000006df34: .ehea_probe_adapter+0x35c/0x39c [ehea]
sp: c0000000740e7410
msr: 8000000000009032
dar: 6b6b6b6b6b6bbdcb
dsisr: 40000000
current = 0xc000000074233780
paca = 0xc0000000008a3300
pid = 2046, comm = modprobe
enter ? for help
[c0000000740e74f0] d00000000006df34 .ehea_probe_adapter+0x35c/0x39c [ehea]
[c0000000740e75a0] c00000000041d5a4 .of_platform_device_probe+0x78/0xb0
[c0000000740e7630] c0000000002d8b38 .driver_probe_device+0x13c/0x200
[c0000000740e76c0] c0000000002d8c90 .__driver_attach+0x94/0xd8
[c0000000740e7750] c0000000002d7d64 .bus_for_each_dev+0x80/0xd8
[c0000000740e7800] c0000000002d889c .driver_attach+0x28/0x40
[c0000000740e7880] c0000000002d8340 .bus_add_driver+0xd4/0x284
[c0000000740e7920] c0000000002d90a0 .driver_register+0xc4/0x198
[c0000000740e79d0] c00000000041d45c .of_register_driver+0x4c/0x60
[c0000000740e7a50] c000000000020ef8 .ibmebus_register_driver+0x30/0x4c
[c0000000740e7ae0] d00000000006e108 .ehea_module_init+0x194/0x208c [ehea]
[c0000000740e7b90] c000000000009028 .do_one_initcall+0x90/0x1ac
[c0000000740e7d90] c00000000008619c .sys_init_module+0xc4/0x200
[c0000000740e7e30] c0000000000084ac syscall_exit+0x0/0x40
(When slub debug is disabled it works fine.)
PAGE_SIZE allocations via slab are not guaranteed to be page-aligned;
use get_zeroed_page for the 'pt' buffer (I don't really know what this
is, only that it is passed to firmware and that the first error
message complains about its alignment). This allows the system to
boot.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 359d67d6ad054ae11ad459665fdfb883aca87782
Author: Julia Lawall <julia@xxxxxxx>
Date: Mon Dec 22 21:53:40 2008 +0000
[CIFS] Remove redundant test
In fs/cifs/cifssmb.c, pLockData is tested for being NULL at the beginning
of the function, and not reassigned subsequently.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit c6fbba0546d3ead18d4a623e76e28bcbaa66a325
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Thu Dec 18 01:41:20 2008 +0000
[CIFS] make sure that DFS pathnames are properly formed
The paths in a DFS request are supposed to only have a single preceding
backslash, but we are sending them with a double backslash. This is
exposing a bug in Windows where it also sends a path in the response
that has a double backslash.
The existing code that builds the mount option string however expects a
double backslash prefix in a couple of places when it tries to use the
path returned by build_path_from_dentry. Fix compose_mount_options to
expect properly formed DFS paths (single backslash at front).
Also clean up error handling in that function. There was a possible
NULL pointer dereference and situations where a partially built option
string would be returned.
Tested against Samba 3.0.28-ish server and Samba 3.3 and Win2k8.
CC: Stable <stable@xxxxxxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit ac6a3ef405f314c206906463ca9913a826a577ee
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:40:40 2008 +0100
Remove an already-checked error condition in SendReceiveBlockingLock
Remove an already-checked error condition in SendReceiveBlockingLock
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 698e96a826939bb24063f6a61801c174e19c32b1
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:39:31 2008 +0100
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 17c8bfed8abbbed82937a751abfc40d2866e3196
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:38:19 2008 +0100
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 2b2bdfba7a3679f67b7c3aca4a4b08b24bb675a8
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Thu Dec 11 17:26:54 2008 +0000
[CIFS] Streamline SendReceive[2] by using "goto out:" in an error condition
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8e4f2e8a1e5cfa07c5b2731accee0e6eb4c64575
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:22:15 2008 +0100
Slightly streamline SendReceive[2]
Slightly streamline SendReceive[2]
Remove an else branch by naming the error condition what it is
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 829049cbb1d2ddda2be17ea008b6b3c457808d91
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:00:53 2008 +0100
Check the return value of cifs_sign_smb[2]
Check the return value of cifs_sign_smb[2]
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 4c3130efda1ef4f28d5f26819fae2e58c3945f0b
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 9 00:28:16 2008 +0000
[CIFS] Cleanup: Move the check for too large R/W requests
This avoids an unnecessary else branch
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 27a97a613b96688e59dd116cae3f0c94107b434c
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Mon Dec 8 20:59:39 2008 +0000
[CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary
"else" branch
This is no functional change, because in the "if" branch we do an early
"return 0;".
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8fbbd365cc700e288fb6f9780b092c5afa4946e5
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 13:12:34 2008 +0100
Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 6d9c6d543165d1d492602c1371cb019040093584
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Mon Dec 8 20:50:24 2008 +0000
[CIFS] In SendReceive, move consistency check out of the mutexed region
inbuf->smb_buf_length does not change in in wait_for_free_request() or in
allocate_mid(), so we can check it early.
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 00e485b0198ea4f509341373f1d9adb0a5977a2f
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: store password in tcon
cifs: store password in tcon
Each tcon has its own password for share-level security. Store it in
the tcon and wipe it clean and free it when freeing the tcon. When
doing the tree connect with share-level security, use the tcon password
instead of the session password.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: have calc_lanman_hash take more granular args
cifs: have calc_lanman_hash take more granular args
We need to use this routine to encrypt passwords associated with the
tcon too. Don't assume that the password will be attached to the
smb_session.
Also, make some of the values in the lower encryption functions
const since they aren't changed.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 55162dec9371a6f6ac63ff546c182cc6144a649e
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: zero out session password before freeing it
cifs: zero out session password before freeing it
...just to be on the safe side.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 85705524258f93a6086c3247a58f34a661b82b3d
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: fix wait_for_response to time out sleeping processes correctly
cifs: fix wait_for_response to time out sleeping processes correctly
The current scheme that CIFS uses to sleep and wait for a response is
not quite what we want. After sending a request, wait_for_response puts
the task to sleep with wait_event(). One of the conditions for
wait_event is a timeout (using time_after()).
The problem with this is that there is no guarantee that the process
will ever be woken back up. If the server stops sending data, then
cifs_demultiplex_thread will leave its response queue sleeping.
I think the only thing that saves us here is the fact that
cifs_dnotify_thread periodically (every 15s) wakes up sleeping processes
on all response_q's that have calls in flight. This makes for
unnecessary wakeups of some processes. It also means large variability
in the timeouts since they're all woken up at once.
Instead of this, put the tasks to sleep with wait_event_timeout. This
makes them wake up on their own if they time out. With this change,
cifs_dnotify_thread should no longer be needed.
I've been testing this in conjunction with some other patches that I'm
working on. It doesn't seem to affect performance at all with with heavy
I/O. Identical iozone -ac runs complete in almost exactly the same time
(<1% difference in times).
Thanks to Wasrshi Nimara for initially pointing this out. Wasrshi, it
would be nice to know whether this patch also helps your testcase.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Cc: Wasrshi Nimara <warshinimara@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8be0ed44c2fa4afcf2c6d2fb3102c926e9f989df
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Fri Dec 5 19:14:12 2008 +0000
[CIFS] Can not mount with prefixpath if root directory of share is
inaccessible
Windows allows you to deny access to the top of a share, but permit access
to
a directory lower in the path. With the prefixpath feature of cifs
(ie mounting \\server\share\directory\subdirectory\etc.) this should have
worked if the user specified a prefixpath which put the root of the mount
at a directory to which he had access, but we still were doing a lookup
on the root of the share (null path) when we should have been doing it on
the prefixpath subdirectory.
This fixes Samba bug # 5925
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 61e748015866e48aff91284e3d300c6e3035a87a
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Wed Dec 3 00:57:54 2008 +0000
[CIFS] various minor cleanups pointed out by checkpatch script
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 3de2091ac722e7dbc37d87d9112ab19ec6a871de
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 2 20:52:28 2008 +0000
[CIFS] fix typo
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit acc18aa1e643519035abdab5e72dc75e534b5198
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 2 18:53:55 2008 +0000
[CIFS] remove sparse warning
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 13a6e42af8d90e2e8eb7fa50adf862a525b70518
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 2 17:24:33 2008 +0000
[CIFS] add mount option to send mandatory rather than advisory locks
Some applications/subsystems require mandatory byte range locks
(as is used for Windows/DOS/OS2 etc). Sending advisory (posix style)
byte range lock requests (instead of mandatory byte range locks) can
lead to problems for these applications (which expect that other
clients be prevented from writing to portions of the file which
they have locked and are updating). This mount option allows
mounting cifs with the new mount option "forcemand" (or
"forcemandatorylock") in order to have the cifs client use mandatory
byte range locks (ie SMB/CIFS/Windows/NTFS style locks) rather than
posix byte range lock requests, even if the server would support
posix byte range lock requests. This has no effect if the server
does not support the CIFS Unix Extensions (since posix style locks
require support for the CIFS Unix Extensions), but for mounts
to Samba servers this can be helpful for Wine and applications
that require mandatory byte range locks.
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
CC: Alexander Bokovoy <ab@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit d5c5605c27c92dac6de1a7a658af5b030847f949
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:42:33 2008 -0500
cifs: make ipv6_connect take a TCP_Server_Info arg
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit bcf4b1063db246a90b9e09e0556f635d632eef36
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:42:15 2008 -0500
cifs: make ipv4_connect take a TCP_Server_Info arg
In order to unify the smb_send routines, we need to reorganize the
routines that connect the sockets. Have ipv4_connect take a
TCP_Server_Info pointer and get the necessary fields from that.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 7586b76585d15db767c19255ba0ecfb164df99f7
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:41:49 2008 -0500
cifs: don't declare smb_vol info on the stack
struct smb_vol is fairly large, it's probably best to kzalloc it...
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 63c038c29774476c5dae759e348c269342b4dbef
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:41:46 2008 -0500
cifs: move allocation of new TCP_Server_Info into separate function
Clean up cifs_mount a bit by moving the code that creates new TCP
sessions into a separate function. Have that function search for an
existing socket and then create a new one if one isn't found.
Also reorganize the initializion of TCP_Server_Info a bit to prepare
for cleanup of the socket connection code.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8ecaf67a8ea58c8f131ff045475c74e9538d6b7a
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 15:23:50 2008 -0500
cifs: account for IPv6 in ses->serverName and clean up netbios name handling
The current code for setting the session serverName is IPv4-specific.
Allow it to be an IPv6 address as well. Use NIP* macros to set the
format.
This also entails increasing the length of the serverName field, so
declare a new macro for RFC1001 name length and use it in the
appropriate places.
Finally, drop the unicode_server_Name field from TCP_Server_Info since
it's not used. We can add it back later if needed, but for now it just
wastes memory.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 954d7a1cf12158fed23dd8b0f3f563d5a5c97f28
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 15:23:50 2008 -0500
cifs: make dnotify thread experimental code
Now that tasks sleeping in wait_for_response will time out on their own,
we're not reliant on the dnotify thread to do this. Mark it as
experimental code for now.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 72ca545b2d83ac7de671bf66d2dbc214528b4c0c
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:36 2008 -0500
cifs: convert tcpSem to a mutex
Mutexes are preferred for single-holder semaphores...
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 0468a2cf914e79442b8309ce62e3f861599d8cab
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:35 2008 -0500
cifs: take module reference when starting cifsd
cifsd can outlive the last cifs mount. We need to hold a module
reference until it exits to prevent someone from unplugging
the module until we're ready.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 80909022ce966191e6140fcc15d8aff57a7df32e
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:35 2008 -0500
cifs: display addr and prefixpath options in /proc/mounts
Have cifs_show_options display the addr and prefixpath options in
/proc/mounts. Reduce struct dereferencing by adding some local
variables.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 24b9b06ba7ea53aa0c4d0b1c8c1e93aa1bd9fe72
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:34 2008 -0500
cifs: remove unused SMB session pointer from struct mid_q_entry
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 26c743bed9b0dc83dc736c68d2a3e7494a9790ad
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:20:13 2008 -0800
mlx4_en: Remove pauses module parameters.
They are controlled through Ethtool interface.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 60b9f9e5588a9e37c35abc2051d57ef12171f916
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:19:47 2008 -0800
mlx4_en: Removed Interrupt moderation module parameters
They are controlled through Ethtool interface, no need to have two
ways to modify them.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c03ea21fcf549eed42de7aaa965ced8bee17aa76
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:14:04 2008 -0800
mlx4_en: Removed redundant cq->armed flag
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 48374ddce72e278e29080e3177e74a13c034d8b4
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:13:45 2008 -0800
mlx4_en: Removed TX locking when polling TX cq
There is no need to synchronize the polling with the transmit
function. The only place to synchronize is when we process
the cq from the transmit function. Also removed spin_lock_irq,
and using spin_trylock, if somebody else is already processing the cq,
no need to wait for it to finish.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b51968d676db1c4e541b4c84de7ce7af812c9e9f
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:13:20 2008 -0800
mlx4_en: Memory leak on completion queue free
If port is being destroyed without being activated before,
CQ resources are not freed.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e74b3f7d568a62d21a76885438d7351948e7355a
Merge: 13e620e0e6c609ccc9882ea280f4f077500d51a0
59f8500efb05096484a55263109acab6a6df89d5
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 25 18:10:12 2008 -0800
Merge branch 'for-david' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
commit 13e620e0e6c609ccc9882ea280f4f077500d51a0
Author: Brice Goglin <brice@xxxxxxxx>
Date: Thu Dec 25 18:09:16 2008 -0800
myri10ge: update driver version to 1.4.4-1.395
Update myri10ge driver version to 1.4.4-1.395.
Signed-off-by: Brice Goglin <brice@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e92df2820d2d8de4be3dcbad96eb144ce6fd550d
Author: Brice Goglin <brice@xxxxxxxx>
Date: Thu Dec 25 18:08:59 2008 -0800
myri10ge: update firmware headers to 1.4.37
Update myri10ge firmware headers to 1.4.37:
* Make each member of the error/cmd enum an initialized one, so there
is a convenient numerical reference to look for reverse conversion.
* Add new MXGEFW_CMD_RELAX_RXBUFFER_ALIGNMENT command.
* Add new "features" field to mcp_header.
Signed-off-by: Brice Goglin <brice@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 36994a0a7004fd4777cd93a4b658b5f84bf4c93e
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Thu Dec 25 18:07:50 2008 -0800
forcedeth: don't poll NV event 36
Polling doesn't seem to be necessary on my hardware, at
least I haven't seen any bad effects testing it a while.
Remove the polling so the CPU doesn't have to wake up a
hundred times per second.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 88a44e51e9a5202f8856f72400fc87a39205186d
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:04:51 2008 -0800
net/appletalk: Remove redundant test
atif is tested for being NULL twice, with the same effect in each case. I
have kept the second test, as it seems to fit well with the comment above
it.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c14ea0ca659d378dd377e417162ebd908d1da4ce
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:03:44 2008 -0800
drivers/net/wan: Remove redundant test
arg is checked not to be NULL a few lines before.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 90f5dfcc6afafcc3e1c18298143c1213b071990d
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:03:28 2008 -0800
drivers/net: Remove redundant test
In each case, ap is checked not to be NULL a few lines before.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 662f44af635f6bde366d44abacaeec7916d9f168
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:03:09 2008 -0800
drivers/net/ehea: Remove redundant test
In each case, vpage is checked not to be NULL just after it is initialized
at the beginning of each loop iteration.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b0fd0d235df2b3cf8e5e244e301614092a9c317c
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:02:49 2008 -0800
drivers/net/au1000_eth.c: Remove redundant test
phydev is checked to be not NULL a few lines above.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c062076cc999795af19ff61d8c76f33e5ceb9ca0
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Thu Dec 25 17:23:50 2008 -0800
qlge: ql_adapter_down() typo
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Ron Mercer <ron.mercer@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 619e803d3c1b7bcc17c45e81f309d0b9b3df2d5d
Author: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Date: Thu Dec 25 17:21:17 2008 -0800
netlink: fix (theoretical) overrun in message iteration
See commit 1045b03e07d85f3545118510a587035536030c1c ("netlink: fix
overrun in attribute iteration") for a detailed explanation of why
this patch is necessary.
In short, nlmsg_next() can make "remaining" go negative, and the
remaining >= sizeof(...) comparison will promote "remaining" to an
unsigned type, which means that the expression will evaluate to
true for negative numbers, even though it was not intended.
I put "theoretical" in the title because I have no evidence that
this can actually happen, but I suspect that a crafted netlink
packet can trigger some badness.
Note that the last test, which seemingly has the exact same
problem (also true for nla_ok()), is perfectly OK, since we
already know that remaining is positive.
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 64ff3b938ec6782e6585a83d5459b98b0c3f6eb8
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 17:12:58 2008 -0800
tcp: Always set urgent pointer if it's beyond snd_nxt
Our TCP stack does not set the urgent flag if the urgent pointer
does not fit in 16 bits, i.e., if it is more than 64K from the
sequence number of a packet.
This behaviour is different from the BSDs, and clearly contradicts
the purpose of urgent mode, which is to send the notification
(though not necessarily the associated data) as soon as possible.
Our current behaviour may in fact delay the urgent notification
indefinitely if the receiver window does not open up.
Simply matching BSD however may break legacy applications which
incorrectly rely on the out-of-band delivery of urgent data, and
conversely the in-band delivery of non-urgent data.
Alexey Kuznetsov suggested a safe solution of following BSD only
if the urgent pointer itself has not yet been transmitted. This
way we guarantee that when the remote end sees the packet with
non-urgent data marked as urgent due to wrap-around we would have
advanced the urgent pointer beyond, either to the actual urgent
data or to an as-yet untransmitted packet.
The only potential downside is that applications on the remote
end may see multiple SIGURG notifications. However, this would
occur anyway with other TCP stacks. More importantly, the outcome
of such a duplicate notification is likely to be harmless since
the signal itself does not carry any information other than the
fact that we're in urgent mode.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8510b937ae1e23583abdeb828cad5c518295c61d
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:59:03 2008 -0800
sctp: Add validity check for SCTP_PARTIAL_DELIVERY_POINT socket option
The latest ietf socket extensions API draft said:
8.1.21. Set or Get the SCTP Partial Delivery Point
Note also that the call will fail if the user attempts to set
this value larger than the socket receive buffer size.
This patch add this validity check for SCTP_PARTIAL_DELIVERY_POINT
socket option.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9fcb95a105758b81ef0131cd18e2db5149f13e95
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:58:11 2008 -0800
sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream
ID
If FWD-TSN chunk is received with bad stream ID, the sctp will not do the
validity check, this may cause memory overflow when overwrite the TSN of
the stream ID.
The FORWARD-TSN chunk is like this:
FORWARD-TSN chunk
Type = 192
Flags = 0
Length = 172
NewTSN = 99
Stream = 10000
StreamSequence = 0xFFFF
This patch fix this problem by discard the chunk if stream ID is not
less than MIS.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aea3c5c05d2c409e93bfa80dcedc06af7da6c13b
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:57:24 2008 -0800
sctp: Implement socket option SCTP_GET_ASSOC_NUMBER
Implement socket option SCTP_GET_ASSOC_NUMBER of the latest ietf socket
extensions API draft.
8.2.5. Get the Current Number of Associations (SCTP_GET_ASSOC_NUMBER)
This option gets the current number of associations that are attached
to a one-to-many style socket. The option value is an uint32_t.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ea686a2653c5586b1c7192958b9d521abde66e92
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:56:45 2008 -0800
sctp: Fix a typo in socket.c
Just fix a typo in socket.c.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e89c2095815d82eaa9fb85eff42f8b65b67a59cf
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:54:58 2008 -0800
sctp: Bring SCTP_MAXSEG socket option into ietf API extension compliance
Brings maxseg socket option set/get into line with the latest ietf socket
extensions API draft, while maintaining backwards compatibility.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 161c8d2f50109b44b664eaf23831ea1587979a61
Author: Krzysztof Halasa <khc@xxxxxxxxx>
Date: Thu Dec 25 16:50:41 2008 -0800
net: PHYLIB mdio fixes #2
The PHYLIB mdio code has more problems in error paths:
- mdiobus_release can be called before bus->state is set to
MDIOBUS_REGISTERED
- mdiobus_scan allocates resources which need to be freed
- the comment is wrong, the resistors used are actually pull-ups.
Signed-off-by: Krzysztof Halasa <khc@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f7d1b9f5aafa371d7f51f644aa3c38bc914e9205
Author: Eric Dumazet <dada1@xxxxxxxxxxxxx>
Date: Thu Dec 25 16:45:19 2008 -0800
vlan: fix convertion to net_device_ops
commit 656299f706e52e0409733d704c2761f1b12d6954
(vlan: convert to net_device_ops) added a net_device_ops
with a NULL ndo_start_xmit field.
This gives a crash in dev_hard_start_xmit()
Fix it using two net_device_ops structures, one for hwaccel vlan,
one for non hwaccel vlan.
Signed-off-by: Eric Dumazet <dada1@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d45227391c70ea12ec129ebfa97841e9b7ff34fd
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:44:01 2008 -0800
smsc911x: fix platform resource call during module unload
This patch fixes a typo, the platform_get_resource calls in
smsc911x_drv_remove are supposed to look the same as those in
smsc911x_drv_probe.
Reported and fixed by dfoley@xxxxxxxxxx
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dc26977f77dd3486b59516d2cc03627009c0d4c6
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:43:34 2008 -0800
smsc911x: don't clobber driver_data
smsc911x uses driver_data to store our net_device, don't overwrite this
with the mii_bus.
Reported and fixed by dfoley@xxxxxxxxxx
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7091e728c570157496e52296d2dbe816a6916836
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Thu Dec 25 16:42:51 2008 -0800
netns: igmp: make /proc/net/{igmp,mcfilter} per netns
This patch makes the followinf proc entries per-netns:
/proc/net/igmp
/proc/net/mcfilter
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Acked-by: Daniel Lezcano <dlezcano@xxxxxxxxxx>
Acked-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b4ee07df3d8121060200dbe1c6686a4e0682bee2
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Thu Dec 25 16:42:23 2008 -0800
netns: igmp: allow IPPROTO_IGMP sockets in netns
Looks like everything is already ready.
Required for ebtables(8) for one thing.
Also, required for ipmr per-netns (coming soon). (Benjamin)
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Acked-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cb5b04fe14394a93eb9a3523f5af9f77480a5a04
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:41:09 2008 -0800
smsc911x: make smsc911x_ethtool_ops constant
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 631b7568c7d8f0222773e1beb2460a86541ae394
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:40:47 2008 -0800
smsc911x: convert driver to use net_device_ops
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dd0451938815d8b901488b1058f52023892c6cde
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:40:19 2008 -0800
smsc911x: fix BUG if module is removed while interface is up
If the module is removed while its interface is up, smsc911x_stop is not
called until after smsc911x_drv_remove has disposed of phy_dev. This
patch changes the stop method to handle this situation.
This is a different problem to the one reported by dfoley@xxxxxxxxxx
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4e202284e6ac1695df3eb4a0e549ea78addfb663
Merge: 826e08b0157c0ce8a80dfe3c0a6c5a1540dd0b1d
80f40ee4a07530cc3acbc239a9299ec47025825b
4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 13:42:23 2008 +0100
Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core
commit cef7125def4dd104769f400c941199614da0aca1
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:55 2008 +0100
[S390] provide documentation for hvc_iucv kernel parameter.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2a7c6f2c39d1291e55403676b25fcfbff78fc5fb
Author: Peter Tiedemann <ptiedem@xxxxxxxxxx>
Date: Thu Dec 25 13:39:54 2008 +0100
[S390] convert ctcm printks to dev_xxx and pr_xxx macros.
Signed-off-by: Peter Tiedemann <ptiedem@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ecf39d42129767c0b4b4a6cf4997c1219c860934
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Dec 25 13:39:53 2008 +0100
[S390] convert zfcp printks to pr_xxx macros.
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5466c2e43e78068cfe634b07fe36dd7a6a7af535
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:52 2008 +0100
[S390] convert vmlogrdr printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 17159dc6fb8769e52edb23d138c2b6bc634397a3
Author: Michael Holzheu <holzheu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:51 2008 +0100
[S390] convert zfcp dumper printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 395d31d40cc38270dd7c024691404e2eddf0678d
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:50 2008 +0100
[S390] convert cpu related printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 74eacdb9c2bf9fc6e8c6785013b5dd0e551a9dfa
Author: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Date: Thu Dec 25 13:39:49 2008 +0100
[S390] convert qeth printks to dev_xxx and pr_xxx macros.
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b3ff088b3025c3583194edd7576215b61333111f
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:48 2008 +0100
[S390] convert sclp printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 8f7c502c267c0e5e2dbbbdea9f3e7e85bbc95694
Author: Ursula Braun <braunu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:47 2008 +0100
[S390] convert iucv printks to dev_xxx and pr_xxx macros.
Signed-off-by: Ursula Braun <braunu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 136f7a1c4239be91e3e0f53532944b9aab7b58f8
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:46 2008 +0100
[S390] convert ap_bus printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 93098bf01578763bb84b627fe893f219cc44b995
Author: Hongjie Yang <hongjie@xxxxxxxxxx>
Date: Thu Dec 25 13:39:45 2008 +0100
[S390] convert dcssblk and extmem printks messages to pr_xxx macros.
Signed-off-by: Hongjie Yang <hongjie@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 1519c0c6ebd2bfd29bae762a1741963a1d06bca2
Author: Melissa Howland <melissah@xxxxxxxxxx>
Date: Thu Dec 25 13:39:44 2008 +0100
[S390] convert monwriter printks to pr_xxx macros.
Signed-off-by: Melissa Howland <melissah@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c5612c1956597687e4bdf59f2649d20d60f5a2b6
Author: Michael Holzheu <holzheu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:43 2008 +0100
[S390] convert s390 debug feature printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit a4f5a299cf8468619dc17f0711017c6d72d6ab94
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Thu Dec 25 13:39:42 2008 +0100
[S390] convert monreader printks to pr_xxx macros.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e7534b0ec9a28c53a7bcc874e818a24d3b49680f
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Thu Dec 25 13:39:41 2008 +0100
[S390] convert appldata printks to pr_xxx macros.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 3b6ed4ab48be2110aa93d9828783bfe86193331d
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:40 2008 +0100
[S390] convert setup printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f55495ba1a56adba57ea7d3164a766d83a631c58
Author: Michael Holzheu <holzheu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:39 2008 +0100
[S390] convert hypfs printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit feab6501d84f7e2f75cf0f5c7d43341431904374
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:38 2008 +0100
[S390] convert time printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 39f09392498d8ee876bea3ad34f26c447924c818
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:37 2008 +0100
[S390] convert cpacf printks to pr_xxx macros.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e6d5a428e01b1387852f17b3dd7934239a0be0d4
Author: Michael Ernst <mernst@xxxxxxxxxx>
Date: Thu Dec 25 13:39:36 2008 +0100
[S390] convert cio printks to pr_xxx macros.
Signed-off-by: Michael Ernst <mernst@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 80a5c36d1dae15520aa0df0eff713c6c41c46035
Author: Frank Munzert <munzert@xxxxxxxxxx>
Date: Thu Dec 25 13:39:35 2008 +0100
[S390] convert vmur printks to pr_xxx macros.
Signed-off-by: Frank Munzert <munzert@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2f526e5acbf1179d30bc9fa1d20b69ec4c0bb689
Author: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Date: Thu Dec 25 13:39:34 2008 +0100
[S390] convert cpcmd printks to pr_xxx macros.
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c99fc5dadcd87e8b97613f50c48407678b731cfb
Author: Klaus-D. Wacker <kdwacker@xxxxxxxxxx>
Date: Thu Dec 25 13:39:33 2008 +0100
[S390] convert lcs printks to dev_xxx and pr_xxx macros.
Signed-off-by: Klaus-D. Wacker <kdwacker@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 8988e58f8b7d4b5e8b64435bedf84e4b3987a63d
Author: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Date: Thu Dec 25 13:39:32 2008 +0100
[S390] convert vmcp printks to pr_xxx macros.
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d1c2f8928a2feab56a181bb7e9afe8f804fd26cd
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:31 2008 +0100
[S390] convert xpram printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit acfa922c5a00eca0abac0e2b6d6666c606c27345
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 13:39:30 2008 +0100
[S390] s390: Remove redundant test
The loop above the modified code only terminates when rc is a valid pointer.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0946100f566d04cc93e86654f3ba588ee94b3f4c
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:29 2008 +0100
[S390] s390/setup: set default preferred console device "ttyS"
This patch sets the default console device for s390.
The console= kernel parameter can be still used to switch the preferred
console to some other device. In that case, console messages are also
printed on the default console device (ttyS0).
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 21e7b2c4d59e5d6631b25e71e777cb0160997d6a
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 13:39:28 2008 +0100
[S390] drivers/s390/crypto: Move dereference to after IS_ERR test
If reply is ERR_PTR(...), then it should not be dereferenced, so I have
moved the dereference from the declaration to after the IS_ERR test.
The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@match exists@
expression x, E;
identifier fld;
position p1,p2;
@@
(
x = E;
|
x = E
|
x@p1->fld
... when != x = E
IS_ERR(x@p2)
... when any
)
@other_match exists@
expression match.x, E1, E2;
position match.p1,match.p2;
@@
x = E1
... when != x = E2
when != x@p1
x@p2
@ script:python depends on !other_match@
p1 << match.p1;
p2 << match.p2;
@@
print "* file %s dereference %s test %s" %
(p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 33b1d09ef317d64c58b135c2e811bb55b3f15b19
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:27 2008 +0100
[S390] panic_stack leak in smp_alloc_lowcore
Fix freeing of the panic_stack if the allocation of async_stack failed.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 4f7e90d6d61fa0e56821787521c12f8a626c4037
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:26 2008 +0100
[S390] clear_table inline assembly contraints
Tell the compile that the clear_table inline assembly writes to the
memory referenced by *s.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c185b783b0993c294ca22ad0a55e6cdf8df4f9d3
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:25 2008 +0100
[S390] Remove config options.
On s390 we always want to run with precise cputime accounting.
Remove the config options VIRT_TIMER and VIRT_CPU_ACCOUNTING.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 349f1b671a4b2612c1355612bedadc81f86d26f1
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:24 2008 +0100
[S390] cpu topology: remove dead code
Interrupts haven't been implemented. So remove the dead code.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2b1a61f0a8c714c96277bf16a823a84bafa1397d
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:23 2008 +0100
[S390] cpu topology: introduce kernel parameter
Introduce a topology=[on|off] kernel parameter which allows to switch
cpu topology on/off. Default will be off, since it looks like that for
some workloards this doesn't behave very well (on s390).
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9fee8db222a344b9ee407fad9c652ed823690788
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:22 2008 +0100
[S390] add new machine types to setup_hwcaps.
Add the machine types for z9-bc, z10-ec and z10-bc to the elf_platform
detection in setup_hwcaps.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c58d92b233a41b81fbbea6add4ba1b512784f837
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:21 2008 +0100
[S390] Remove initial kernel stack backchain initialization.
Early init code clears the backchain of the initial kernel stack frame.
This is not necessary since it is pre initialized with zeros. Plus it
was broken on 64 bit since it cleared only four of eight bytes.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 64253acbf189085fb0ceb9a3fbe43b40f4a0a932
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Thu Dec 25 13:39:20 2008 +0100
[S390] s390: use the new byteorder headers
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e37f50e1811d68170e4d58a087cf634b2bf1cef9
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:19 2008 +0100
[S390] Add processor type march=z10 and a processor type safety check.
This patch adds the code generation option for IBM System z10 and
adds a check in head[31,64].S to prevents the execution of a kernel
compiled for a new processor type on an old machine.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b3b59d3339c907b1dec3ce19f62b2a7f120d142d
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:18 2008 +0100
[S390] sclp vt220: fix compile warning
get rid of this one:
CC drivers/s390/char/sclp_vt220.o
drivers/s390/char/sclp_vt220.c:588: warning: '__sclp_vt220_flush_buffer'
defined but not used
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2d6cd2a5908adecd06c8cee2a73814463ed71493
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:17 2008 +0100
[S390] remove warnings with functions ending in BUG
Functions which end in a BUG() statement and skip the return statement
cause compile warnings on s390, e.g.:
mm/bootmem.c: In function 'mark_bootmem':
mm/bootmem.c:321: warning: control reaches end of non-void function
To avoid the warning add an endless loop to the BUG() macro.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit edd5378740fe7717b1377ee04e593cfad8d29650
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:16 2008 +0100
[S390] mark disabled_wait as noreturn function
disabled_wait() won't return, so add an __attribute__((noreturn)).
This will remove a false positive finding which our internal code
checker reports.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d36f0c66389eb5e4dbd9b095eea252230ba3273e
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:15 2008 +0100
[S390] cio: use pim to check for multipath.
To check if multipath is available we count the bits set in lpm,
which could change over time (via configure [on|off] of a path).
The following patch uses the pim (which is persistent) for this
decision.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f444cc0e52523560a8dfc12f5374e5d5ecf5375b
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:14 2008 +0100
[S390] cio: commit all pmcw changes.
Sometimes we change the pmcw configuration but don't call msch
to transmit these changes to the channel subsystem.
The patch fixes this by calling cio_commit_config in such cases.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 13952ec12dfeea793ff83c2a96139ed57eb0b897
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:13 2008 +0100
[S390] cio: introduce cio_commit_config
To change the configuration of a subchannel we alter the modifiable
bits of the subchannel's schib field and issue a modify subchannel.
There can be the case that not all changes were applied -or worse-
quietly overwritten by the hardware. With the next store subchannel
we obtain the current state of the hardware but lose our target
configuration.
With this patch we introduce a subchannel_config structure which
contains the target subchannel configuration. Additionally the msch
wrapper cio_modify is replaced with cio_commit_config which
copies the desired changes to a temporary schib. msch is then
called with the temporary schib. This schib is only written back
to the subchannel if all changes were applied.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit cdb912a40df8b8507ab60b3d52f9980c0ba1f44d
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:12 2008 +0100
[S390] cio: introduce cio_update_schib
There is the chance that we get condition code 0 for a stsch but
the resulting schib is not vaild. In the current code there are
2 cases:
* we do a check for validity of the schib after stsch, but at this
time we have already stored the invaild schib in the subchannel
structure. This may lead to problems.
* we don't do a check for validity, which is not that good either.
The patch addresses both issues by introducing the stsch wrapper
cio_update_schib which performs stsch on a local schib. This schib
is only written back to the subchannel if it's valid.
side note: For some functions (chp_events) the return codes are
different now (-ENXIO vs -ENODEV) but this shouldn't do harm
since the caller doesn't check for _specific_ errors.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d6a30761d8116b8de8a5b5e79e68cce81d36414b
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:11 2008 +0100
[S390] cio: Use device_is_registered().
Check if a ccw device is registered via device_is_registered()
and not via the old kludge of checking the membership in driver
core internal klists.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 283fdd0b8ab102080dbffe4bcaae245f9ceda184
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:10 2008 +0100
[S390] cio: Dont call ->release directly.
Just put the cdev's reference count to give up our reference.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 90ed2b692fa75272d7395c4e4c2de4423d52f506
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:09 2008 +0100
[S390] cio: Dont fail probe for I/O subchannels.
If we fail the probe for an I/O subchannel, we won't be able
to unregister it again since there are no sch_event()
callbacks for unbound subchannels. Just succeed the probe in
any case and schedule unregistering the subchannel.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5fb6b8544d9ccd2ed478af777f9e99e342eb8886
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:08 2008 +0100
[S390] cio: Only register ccw_device for registered subchannel.
There is a race between io_subchannel_register() and
io_subchannel_sch_event() which may cause a subchannel to be
unregistered because it is no longer operational before
io_subchannel_register() had run. We need to check whether the
subchannel is still registered before the ccw device can be
registered and just bail out if it is not.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6eff208f479d6fe99fd92c0e6bf7e930bb45cd30
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:07 2008 +0100
[S390] cio: Fix I/O subchannel refcounting.
Subchannel refcounting was incorrect in some places, especially
a refcount was missing when ccw_device_call_sch_unregister()
was called and the refcount was not correctly switched after
moving devices.
Fix this by establishing the following rules:
- The ccw_device obtains a reference on its parent subchannel
when dev.parent is set and gives it up in its release
function. This is needed because we need a parent reference
for correct refcounting even before the ccw device is (if at
all) registered.
- When calling device_move(), obtain a reference on the new
subchannel before moving the ccw device and give up the
reference on the old parent after moving. This brings the
refcount in line with the first rule.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9cd67421977a701272820987ff9e6f197b1b97b7
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:06 2008 +0100
[S390] cio: Fix reference counting for online/offline.
The current code attempts to get an extra reference count
for online devices by doing a get_device() in ccw_device_online()
and a put_device() in ccw_device_done(). However, this
- incorrectly obtains an extra reference for disconnected
devices becoming available again (since they are already
online)
- needs special checks for css_init_done in order to handle
the console device
- is not obvious and
- may incorretly drop a reference count in ccw_device_done() if
that function is called after path verification for a device
that just became not operational.
So let's just get the reference in ccw_device_set_online() and
drop it in ccw_device_set_offline(). (Unfortunately, we still
need the special case in io_subchannel_probe().)
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 97166f52fc84c0bc49c7dbba2a26720110acb458
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:05 2008 +0100
[S390] cio: Put referernce on correct device after moving.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c619d4223eaa063dd15ce44235b04487235f8cb7
Author: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Date: Thu Dec 25 13:39:04 2008 +0100
[S390] cio: fix ccwgroup online vs. ungroup race condition
Ensure atomicity of ungroup operation to prevent concurrent ungroup
and online processing which may lead to use-after-release situations.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 111e95a4cae01d6dadbbd1d8ab28dcd10fa5619c
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:03 2008 +0100
[S390] cio: move irritating comment.
Due to former patches a comment and device id initialization were
split from the addressed function call in io_subchannel_probe.
Move it back to where it belongs.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d7b604891b7ce7de93e3758ec6b3b7b7964e1884
Author: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Date: Thu Dec 25 13:39:02 2008 +0100
[S390] cio: update sac values
Values for the sac field have changed - update code accordingly.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 191fd44c11e10daf9d2cabd16935952e9c735949
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:01 2008 +0100
[S390] cio: get rid of compile warning
Move cio_tpi() to the rest of the CONFIG_CCW_CONSOLE functions to
get rid of this one:
drivers/s390/cio/cio.c:115: warning: 'cio_tpi' defined but not used
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 547e3cec4f7a4846707db19cba43aa58eb07f48f
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:00 2008 +0100
[S390] remove ptrace warning on 31 bit.
A kernel compile on 31 bit gives the following warnings in ptrace.c:
arch/s390/kernel/ptrace.c: In function 'peek_user':
arch/s390/kernel/ptrace.c:207: warning: unused variable 'dummy'
arch/s390/kernel/ptrace.c: In function 'poke_user':
arch/s390/kernel/ptrace.c:315: warning: unused variable 'dummy'
Getting rid of the dummy variables removes the warnings.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 32272a26974d2027384fd4010cd1780fca425d94
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:59 2008 +0100
[S390] __page_to_pfn warnings
For CONFIG_SPARSEMEM_VMEMMAP=y on s390 I get warnings like
init/main.c: In function 'start_kernel':
init/main.c:641: warning: format '%08lx' expects type 'long unsigned int',
but argument 2 has type 'int'
The warning can be suppressed with a cast to unsigned long in the
CONFIG_SPARSEMEM_VMEMMAP=y version of __page_to_pfn.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 91d5d45ee0a8978870fd12e5c3fe394a530ec2ed
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:58 2008 +0100
[S390] iucv: Locking free version of iucv_message_(receive|send)
Provide a locking free version of iucv_message_receive and iucv_message_send
that do not call local_bh_enable in a spin_lock_(bh|irqsave)() context.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
commit 44a01d5ba8a4d543694461cd3e178cfa6b3f221b
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:57 2008 +0100
[S390] s390/hvc_console: z/VM IUCV hypervisor console support
This patch introduces a new hypervisor console (HVC) back-end that provides
terminal access over the z/VM inter-user communication vehicle (IUCV).
The z/VM IUCV communication is independent of the regular tcp/ip network
and allows access even if there is no network connection between two
z/VM guest virtual machines.
The z/VM IUCV hypervisor console back-end helps the user to access a
z/VM guest virtual machine that lacks of network connectivity; and thus,
provides a "full-screen" terminal alternative to 3215/3270 terminal
sessions.
Use the hvc_iucv=[0..8] kernel boot parameter to specify the number of
HVC terminals using a z/VM IUCV back-end.
A recent version of the s390-tools package is required to establish a
terminal connection to a z/VM IUCV hypervisor console back-end.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5d360a75f87f288e9a25d56cca503a7c7939e490
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:56 2008 +0100
[S390] ftrace: function tracer backend for s390
This implements just the basic function tracer (_mcount) backend for s390.
The dynamic variant will come later.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 98df67b324a2a986987ce29986e44ae9156b6698
Author: Kay Sievers <kay.sievers@xxxxxxxx>
Date: Thu Dec 25 13:38:55 2008 +0100
[S390] struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0cd4bd4754d51bdc8f9cd880c29910d0d52337bb
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Thu Dec 25 13:38:54 2008 +0100
[S390] dasd: call cleanup_cqr with request_queue_lock
__dasd_cleanup_cqr should be called with request_queue_lock held and
__dasd_block_process_erp with queue_lock
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 50afd20f8c3ce23994a21c389e7250e54a93bf55
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Thu Dec 25 13:38:53 2008 +0100
[S390] dasd: correct sense byte condition for SIM
SIM sense data are always 32 bit sense data so sense byte 27 bit 0
has not to be set.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit faf16aa9b368d48a0efbd0920718d68ec7a72542
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:38:52 2008 +0100
[S390] dasd: Use accessors instead of using driver_data directly.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2bf373b3e3691d5cb57089a3897316a1b7d5ffa7
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Thu Dec 25 13:38:51 2008 +0100
[S390] dasd: improve dasd statistics proc interface
For a large number of I/O requests the values were shifted binary.
The shift was not transparent for the user because the shift value
was not displayed. To make this interface more human readable the
values are shifted decimal and the scale factor is displayed.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit bd43a42b7e9880f426ed715f18bb4f963b7352af
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Dec 25 13:38:50 2008 +0100
[S390] zfcp: Report microcode level through service level interface
Register zfcp with the new /proc/service_level interface to report the
FCP microcode level. When the adapter goes offline or a channel path
disappears, zfcp unregisters, since the microcode version might change
and zfcp does not know about it.
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6bcac508fbebdca52f5a55d69a4316997ecb5391
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:49 2008 +0100
[S390] service level interface.
Add a new proc interface /proc/service_levels that allows any code
to report a relevant service level, e.g. the microcode level of
devices, the service level of the hypervisor, etc.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 7a0b4cbc7d7d99763511b488b08bbc2607ddd1e3
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:48 2008 +0100
[S390] qdio: fix error reporting for hipersockets
Hipersocket connections can encounter temporary busy conditions.
In case of the busy bit set we retry the SIGA operation immediatelly.
If the busy condition still persists after 100 ms we fail and report
the error to the upper layer. The second stage retry logic is removed.
In case of ongoing busy conditions the upper layer needs to reset the
connection.
The reporting of a SIGA error is now done synchronously to allow the
network driver to requeue the buffers. Also no error trace is created
for the temporary SIGA errors so the error message view is not flooded.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 50f769df1c4bea766c4eb927eae35728fb93e305
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:47 2008 +0100
[S390] qdio: improve inbound buffer acknowledgement
- Use automatic acknowledgement of incoming buffers in QEBSM mode
- Move ACK for non-QEBSM mode always to the newest buffer to prevent
a race with qdio_stop_polling
- Remove the polling spinlock, the upper layer drivers return new buffers
in the same code path and could not run in parallel
- Don't flood the error log in case of no-target-buffer-empty
- In handle_inbound we check if we would overwrite an ACK'ed buffer, if so
advance the pointer to the oldest ACK'ed buffer so we don't overwrite an
empty buffer in qdio_stop_polling
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 22f9934767f49012ffbae753b28b8055bd28348f
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:46 2008 +0100
[S390] qdio: rework debug feature logging
- make qdio_trace a per device view
- remove s390dbf exceptions
- remove CONFIG_QDIO_DEBUG, not needed anymore if we check for the level
before calling sprintf
- use snprintf for dbf entries
- add start markers to see if the dbf view wrapped
- add a global error view for all queues
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9a1ce28aeb7a8b1666eaa9f104c1a2f5a149f9df
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:45 2008 +0100
[S390] qdio: fix compile warning under 31 bit
The QEBSM instructions are only available for CONFIG_64BIT, they are not
used under 31 bit. Make compiler happy about the false positive:
drivers/s390/cio/qdio_main.c: In function ?qdio_inbound_q_done?:
drivers/s390/cio/qdio_main.c:532: warning: ?state? may be used
uninitialized in this function
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 23589d057ac2da81e456d4a9dcdd9135fd96f493
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:44 2008 +0100
[S390] qdio: add eqbs/sqbs instruction counters
Add counters for the eqbs and sqbs instructions that indicate how often
we issued the instructions and how often the instructions returned with
less buffers than specified.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit bbd50e172f75b1d12ef9b1bcf593b51a44199016
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:43 2008 +0100
[S390] qdio: fix qeth port count detection
qeth needs to get the port count information before
qdio has allocated a page for the chsc operation.
Extend qdio_get_ssqd_desc() to store the data in the
specified structure.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 43c207e6e5b7e591b59294ee4fc9860b0e3de3b8
Author: Christian Maaser <cmaaser@xxxxxxxxxx>
Date: Thu Dec 25 13:38:42 2008 +0100
[S390] ap: Minor code beautification.
Changed some symbol names for a better and clearer code.
Signed-off-by: Christian Maaser <cmaaser@xxxxxxxxxx>
Signed-off-by: Felix Beck <beckf@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit cb17a6364a29b4dfe5bbb00696032fb63d780157
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Thu Dec 25 13:38:41 2008 +0100
[S390] zcrypt: Use of Thin Interrupts
When the machine supports AP adapter interrupts polling will be
switched off at module initialization and the driver will work in
interrupt mode.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 320c04c068c62b71fe9ea55e06e4968b4edc9e48
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:40 2008 +0100
[S390] Move stfle to header file.
stfle will be needed by the ap_bus module to figure out wether the AP
queue adapter interruption facility is installed.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ca9fc75a68ee98812bb6d212405fea039421910b
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:39 2008 +0100
[S390] convert s390 to generic IPI infrastructure
Since etr/stp don't need the old smp_call_function semantics anymore
we can convert s390 to the generic IPI infrastructure.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0b3016b781abeabc502042c942cbc611e31250c7
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:38 2008 +0100
[S390] serialize stp/etr work
The work function dispatched with schedule_work() can be run twice
on different cpus because run_workqueue clears the WORK_STRUCT_PENDING
bit and then executes the function. Another cpu can call schedule_work()
again and run the work function a second time before the first call
is completed. This patch serialized the etr and stp work function with
a mutex.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 750887dedc088d28198b170bcae83695247797d1
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:37 2008 +0100
[S390] convert etr/stp to stop_machine interface
This converts the etr and stp code to the new stop_machine interface
which allows to synchronize all cpus without allocating any memory.
This way we get rid of the only reason why we haven't converted s390
to the generic IPI interface yet.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b020632e40c3ed5e8c0c066d022672907e8401cf
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:36 2008 +0100
[S390] introduce vdso on s390
Add a vdso to speed up gettimeofday and clock_getres/clock_gettime for
CLOCK_REALTIME/CLOCK_MONOTONIC.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit fc5243d98ac2575ad14a974b3c097e9ba874c03d
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:35 2008 +0100
[S390] arch_setup_additional_pages arguments
arch_setup_additional_pages currently gets two arguments, the binary
format descripton and an indication if the process uses an executable
stack or not. The second argument is not used by anybody, it could
be removed without replacement.
What actually does make sense is to pass an indication if the process
uses the elf interpreter or not. The glibc code will not use anything
from the vdso if the process does not use the dynamic linker, so for
statically linked binaries the architecture backend can choose not
to map the vdso.
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit a114a9d69d1362546b9dda651028acb311ddb7af
Author: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Date: Thu Dec 25 13:38:34 2008 +0100
[S390] vmcp: remove BKL
The vmcp driver uses the session->mutex for concurrent access of the data
structures. Therefore, the BKL in vmcp_open does not protect against any
other function in the driver.
The BLK in vmcp_open would protect concurrent access to the module init
but all necessary steps ave finished before misc_register is called.
We can safely remove the lock_kernel from vcmp.
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f414f5f15376764d68a31dc568d9e814d3fcb58a
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:37:59 2008 +0100
[S390] cpu topology: dont destroy cpu sets on topology change
Call rebuild_sched_domains instead of arch_reinit_sched_domains if
cpu topology changes. This leaves cpu sets alone which otherwise would
be destroyed.
If and how it makes sense to define cpu sets on a virtualized
architecture is another question.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 8f2961c39eacd5d450048d8a3e91675486f3a015
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:37:58 2008 +0100
[S390] audit: get s390 ret_from_fork in sync with other architectures
On s390 we have ret_from_fork jump not to the "do all work we
normally do on return from syscall" as on x86, ppc, etc., but to the
"do all such work except audit". Historical reasons - the codepath
triggered when we have AUDIT process flag set is separated from the
normall one and they converge at sysc_return, which is the common
part of post-syscall work. And does not include calling
audit_syscall_exit() -
that's done in the end of sysc_tracesys path, just before that path jumps
to sysc_return.
IOW, the child returning from fork()/clone()/vfork() doesn't
call audit_syscall_exit() at all, so no matter what we do with its
audit context, we are not going to see the audit entry.
The fix is simple: have ret_from_fork go to the point just past
the call of sys_.... in the 'we have AUDIT flag set' path. There we
have (64bit variant; for 31bit the situation is the same):
sysc_tracenogo:
tm __TI_flags+7(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)
jz sysc_return
la %r2,SP_PTREGS(%r15) # load pt_regs
larl %r14,sysc_return # return point is sysc_return
jg do_syscall_trace_exit
which is precisely what we need - check the flag, bugger off to sysc_return
if not set, otherwise call do_syscall_trace_exit() and bugger off to
sysc_return. r9 has just been properly set by ret_from_fork itself,
so we are fine.
Tested on s390x, seems to work fine. WARNING: it's been about
16 years since my last contact with 3X0 assembler[1], so additional
review would be very welcome. I don't think I've managed to screw it
up, but...
[1] that *was* in another country and besides, the box is dead...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5439050f9f1aa92381ab9beccbea6ddf0c687c2b
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:37:57 2008 +0100
[S390] cpu topology: fix cpu_core_map initialization
Common code doesn't call arch_update_cpu_topology() anymore on
cpu hotplug. But our architecture backend relied on that in order to
update the cpu_core_map. For machines without cpu topology support
this leads uninitialized cpu_core_maps for later on added cpus.
To solve this just initialize the maps with cpu_possible_map, since
that will be always valid for machines without topology support.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5250d329e38cdf7580faeb9c53c17d3588d7d19c
Merge: a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
468a15bb4cc61694495cc5ed7ffca29e87c79b69
67be403d897f818b1a5ecc201967b0ee6a0332f9
98db8df777438e16ad0f44a0fba05ebbdb73db8d
4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 13:11:00 2008 +0100
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and
'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core
commit 468a15bb4cc61694495cc5ed7ffca29e87c79b69
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Tue Dec 16 08:07:03 2008 +0100
sched, trace: update trace_sched_wakeup()
Impact: extend the wakeup tracepoint with the info whether the wakeup was
real
Add the information needed to distinguish 'real' wakeups from 'false'
wakeups.
Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
Merge: 30cd324e9787ccc9a5ede59742d5409857550692
7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 12:48:18 2008 +0100
Merge branch 'x86/tsc' into tracing/core
Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:
Conflicts:
arch/x86/kernel/cpu/intel.c
commit 79a66b96c339626a3e4b226fefc0e45244cfe6ff
Merge: bed4f13065b520e564adffbfcd1c1a764a9c887e
c1c15b65ec30275575dac9322aae607075769fbc
1fcccb008be12ea823aaa392758e1e41fb82de9a
4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 11:50:41 2008 +0100
Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core
commit 1fcccb008be12ea823aaa392758e1e41fb82de9a
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Tue Dec 23 21:50:11 2008 +0530
x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
Impact: cleanup, avoid warning on X86_64
Fixes this warning on X86_64:
CC arch/x86/kernel/traps.o
arch/x86/kernel/traps.c:695:5: warning: "CONFIG_X86_32" is not defined
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5ce442fe2c9423ec5451222aee6f9b2127bb8311
Merge: 60cda2b53a7826d273198f668cd124f0eeda0e4a
2af752936b311a846622668f8b0f1893d8eccade
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:34 2008 +0100
Merge branch 'topic/udev-id-rename' into to-push
commit 60cda2b53a7826d273198f668cd124f0eeda0e4a
Merge: 9649745c8670eacc671e9cff72c5c1e346e13036
3d1ee379bd576c0830050c2d313e77b9f98a8013
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:33 2008 +0100
Merge branch 'topic/sound-core-fix' into to-push
commit 9649745c8670eacc671e9cff72c5c1e346e13036
Merge: a9c3c7e04b9a744eafb2e87c770e7300bbffa375
5e03c54eeb016cf1b066e9e48d30116814ca2459
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:32 2008 +0100
Merge branch 'topic/snd-hrtimer' into to-push
commit a9c3c7e04b9a744eafb2e87c770e7300bbffa375
Merge: cc4910850f93a8bb1cbafad038fd40f6da68c783
ade9b2fb9bf8114f77eefc70b9042417e62acf72
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:31 2008 +0100
Merge branch 'topic/pcxhr-update' into to-push
commit cc4910850f93a8bb1cbafad038fd40f6da68c783
Merge: a8022697811c3f2271df5ec14fa6f518b731b46a
de04b102bfc9a13e96f0892305b394077ffb6514
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:30 2008 +0100
Merge branch 'topic/oxygen' into to-push
commit a8022697811c3f2271df5ec14fa6f518b731b46a
Merge: a65056205cdf7efb96fb2558e4f1ec6bae2582ed
cdc693643271b2e6a693cf8f6afb258cce01f058
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:29 2008 +0100
Merge branch 'topic/jack-mechanical' into to-push
commit a65056205cdf7efb96fb2558e4f1ec6bae2582ed
Merge: 313769d9edb1bbd59d2e94f5069950eecfe6fa44
7645c4bfbb36f357f03815f5729c46ce8d89f008
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:28 2008 +0100
Merge branch 'topic/hda' into to-push
commit 313769d9edb1bbd59d2e94f5069950eecfe6fa44
Merge: 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5
f144b7f6679d9833bd3b94b91e452592b6d0e502
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:28 2008 +0100
Merge branch 'topic/cs5535audio' into to-push
commit 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5
Merge: 86b3aa390b4b9925f16a21b98441fd7abdb9fff2
1f04128a3db7c0f0e8b5d25323eba70ac342f47f
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:27 2008 +0100
Merge branch 'topic/convert-tasklet' into to-push
commit 86b3aa390b4b9925f16a21b98441fd7abdb9fff2
Merge: e4456e71618ec2c98084c15824d93e997955b60c
ebef7cfc81942686a994ca6239b195040f5d1e4d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:26 2008 +0100
Merge branch 'topic/ca0106' into to-push
commit e4456e71618ec2c98084c15824d93e997955b60c
Merge: 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57
16950e09cf07b54abb78dd09f8ef3c85c6bdc9de
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:26 2008 +0100
Merge branch 'topic/audigy-capture-boost' into to-push
commit 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57
Merge: facef8685b3ff95c01c33d9d836401d0dd26211d
472346da9cc4231bec03ff2032e0d5fd4037232c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:25 2008 +0100
Merge branch 'topic/asoc' into to-push
commit facef8685b3ff95c01c33d9d836401d0dd26211d
Merge: 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
888dcb7cb26fb85dfe3486d28a2431d69d3e8148
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:24 2008 +0100
Merge branch 'topic/aoa' into to-push
commit 0ca59dd948a51c95d5a366d35f897bc5ef9df55d
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Wed Dec 24 23:30:02 2008 +0100
tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
Impact: fix a crash/hard-reboot on certain configs while enabling cpu
runtime
On some archs, the boot of a secondary cpu can have an early fragile state.
On x86-64, the pda is not initialized on the first stage of a cpu boot but
it is needed to get the cpu number and the current task pointer. This data
is needed during tracing. As they were dereferenced at this stage, we got a
crash while tracing a cpu being enabled at runtime.
Some other archs like ia64 can have such kind of issue too.
Changes on v2:
We dropped the previous solution of a per-arch called function to guess the
current state of a cpu. That could slow down the tracing.
This patch removes the -pg flag on arch/x86/kernel/cpu/common.c where
the low level cpu boot functions exist, on start_secondary() and a helper
function used at this stage.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2a0d8366dde9c66d8f481bee56828b661e5c8bf1
Merge: 1f5175adeaa1d161f603ef351785a19814dfe900
139cdab0a2af6f5eaee47cc0144608e53b65279d
3d0890985ac4dff781b7feba19fedda547314749
bba7ebba3b17f4fe8c5907a32e16d9bd3fcf5192
7798dbf40ad9d295aa3a02eca700168e4327239a
e189062a8ca55b0a1843f0346c3fae1a47297c34
Author: Roland Dreier <rolandd@xxxxxxxxx>
Date: Wed Dec 24 20:35:42 2008 -0800
Merge branches 'cma', 'ehca', 'ipath', 'iser', 'mlx4' and 'nes' into
for-next
commit 7798dbf40ad9d295aa3a02eca700168e4327239a
Author: Jack Morgenstein <jackm@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 20:32:42 2008 -0800
IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
When resizing a CQ, when copying over unpolled CQEs from the old CQE
buffer to the new buffer, the ownership bit must be set appropriately
for the new buffer, or the ownership bit in the new buffer gets
corrupted.
Signed-off-by: Jack Morgenstein <jackm@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit e189062a8ca55b0a1843f0346c3fae1a47297c34
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Wed Dec 24 20:30:04 2008 -0800
RDMA/nes: Remove tx_free_list
There is no lock protecting tx_free_list thus causing a system crash
when skb_dequeue() is called and the list is empty. Since it did not give
any performance boost under heavy load, remove it to simplify the code.
Replace get_free_pkt() with dev_alloc_skb() to allocate MAX_CM_BUFFER skb
for connection establishment/teardown as well as MPA request/response.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 81ea714bf148fce35e931edcbdfd3aedda20d1dc
Author: Sergio Luis <sergio@xxxxxxxxxxxxxx>
Date: Mon Dec 22 01:16:15 2008 -0300
smackfs: check for allocation failures in smk_set_access()
smackfs: check for allocation failures in smk_set_access()
While adding a new subject/object pair to smack_list, smk_set_access()
didn't check the return of kzalloc().
This patch changes smk_set_access() to return 0 or -ENOMEM, based on
kzalloc()'s return. It also updates its caller, smk_write_load(), to
check for smk_set_access()'s return, given it is no longer a void
return function.
Signed-off-by: Sergio Luis <sergio@xxxxxxxxxxxxxx>
To: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Cc: Ahmed S. Darwish <darwish.07@xxxxxxxxx>
Cc: LSM <linux-security-module@xxxxxxxxxxxxxxx>
Cc: LKLM <linux-kernel@xxxxxxxxxxxxxxx>
Acked-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
commit cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db
Merge: 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
74192246910ff4fb95309ba1a683215644beeb62
Author: James Morris <jmorris@xxxxxxxxx>
Date: Thu Dec 25 11:40:09 2008 +1100
Merge branch 'next' into for-linus
commit 0ee4a96902dd7858e65f378c86f428a0355bd841
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 11:05:13 2008 +1100
crypto: aes - Precompute tables
The tables used by the various AES algorithms are currently
computed at run-time. This has created an init ordering problem
because some AES algorithms may be registered before the tables
have been initialised.
This patch gets around this whole thing by precomputing the tables.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit ca38a814c6f86db0aa58884a31093d4f096e20aa
Author: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Date: Sat Dec 20 17:09:25 2008 +1100
crypto: talitos - Ack done interrupt in isr instead of tasklet
Previous commit for interrupt mitigation moved the done interrupt
acknowlegement from the isr to the talitos_done tasklet.
This patch moves the done interrupt acknowledgement back
into the isr so that done interrupts will always be acknowledged.
This covers the case for acknowledging interrupts for channel done
processing
that has actually already been completed by the tasklet prior to fielding
a pending interrupt.
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit bcf84a38f05c55180bc1225901950c7e715c0d55
Author: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Date: Thu Dec 18 17:17:46 2008 +1100
crypto: testmgr - Correct comment about deflate parameters
The comment for the deflate test vectors says the winbits parameter is 11,
while the deflate module actually uses -11 (a negative window bits parameter
enables the raw deflate format instead of the zlib format).
Correct this, to avoid confusion about the format used.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit f0d1ec3a227e01a27ce20719bf7b58de86d44f0f
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Wed Dec 17 16:53:49 2008 +1100
crypto: salsa20 - Remove private wrappers around various operations
ROTATE -> rol32
XOR was always used with the same destination, use ^=
PLUS/PLUSONE use ++ or +=
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit ad79cdd77fc1466e45cf923890f66bcfe7c43f12
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Wed Dec 17 16:51:13 2008 +1100
crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
While its a slightly insane to bypass the key1 == key2 ||
key2 == key3 check in triple-des, since it reduces it to the
same strength as des, some folks do need to do this from time
to time for backwards compatibility with des.
My own case is FIPS CAVS test vectors. Many triple-des test
vectors use a single key, replicated 3x. In order to get the
expected results, des3_ede_setkey() needs to only reject weak
keys if the CRYPTO_TFM_REQ_WEAK_KEY flag is set.
Also sets a more appropriate RES flag when a weak key is found.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit bd9d20dba182ce4541b16b083eccd30fb252b9f4
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 17 16:49:02 2008 +1100
crypto: sha512 - Switch to shash
This patch changes sha512 and sha384 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit f9e2bca6c22d75a289a349f869701214d63b5060
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 17 16:47:52 2008 +1100
crypto: sha512 - Move message schedule W[80] to static percpu area
The message schedule W (u64[80]) is too big for the stack. In order
for this algorithm to be used with shash it is moved to a static
percpu area.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 19e2bf146759aea38fd6c2daea08cb7a6367149b
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Sun Dec 7 19:35:38 2008 +0800
crypto: michael_mic - Switch to shash
This patch changes michael_mic to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4946510baac6aaa8658528e3deefc7e9ba2951a9
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Sun Dec 7 19:34:37 2008 +0800
crypto: wp512 - Switch to shash
This patch changes wp512, wp384 and wp256 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit f63fbd3d501b4283e1551e195cb74434a838064f
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:58:32 2008 +0800
crypto: tgr192 - Switch to shash
This patch changes tgr192, tgr160 and tgr128 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 50e109b5b9c1f734e91a6e9b557bce48c9a88654
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:57:49 2008 +0800
crypto: sha256 - Switch to shash
This patch changes sha256 and sha224 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 14b75ba70da925a9f040a7575cb46ad7d394b117
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:57:12 2008 +0800
crypto: md5 - Switch to shash
This patch changes md5 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 808a1763cef93bf0f740d7e10dd9a2dfc4065b1a
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:55:27 2008 +0800
crypto: md4 - Switch to shash
This patch changes md4 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 54ccb36776eb7e03b592bfab60393c7800851a0b
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Tue Dec 2 21:08:20 2008 +0800
crypto: sha1 - Switch to shash
This patch changes sha1 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3b8efb4c4147094652570d7791a516d07b7df8c2
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 10:11:09 2008 +0800
crypto: rmd320 - Switch to shash
This patch changes rmd320 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d8a5e2e9f4e70ade136c67ce8242f0db4c2cddc7
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 09:58:10 2008 +0800
crypto: rmd256 - Switch to shash
This patch changes rmd256 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit e5835fba0206a331bdefdf5d805d1a384af37c44
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 09:18:51 2008 +0800
crypto: rmd160 - Switch to shash
This patch changes rmd160 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 7c4468bc011131e77d0a872d6d9942390f8217ea
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 09:10:40 2008 +0800
crypto: rmd128 - Switch to shash
This patch changes rmd128 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d35d2454ce2175be77d2a366c2648597fd33a98f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 08:09:56 2008 +0800
crypto: null - Switch to shash
This patch changes digest_null to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3751f402e099893c34089ed303dca6f5f92dbfd1
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 08:56:57 2008 +0800
crypto: hash - Make setkey optional
Since most cryptographic hash algorithms have no keys, this patch
makes the setkey function optional for ahash and shash.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit b812eb0076235743872b5c9d18714d2324cc668d
Author: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Date: Fri Nov 28 20:51:28 2008 +0800
crypto: testmgr - Validate output length in (de)compression tests
When self-testing (de)compression algorithms, make sure the actual size of
the (de)compressed output data matches the expected output size.
Otherwise, in case the actual output size would be smaller than the expected
output size, the subsequent buffer compare test would still succeed, and no
error would be reported.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit dad3df2044b78ba68a92bf78e38a408bab80ff61
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Fri Nov 28 20:49:19 2008 +0800
crypto: remove uses of __constant_{endian} helpers
Base versions handle constant folding just fine.
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 664134d2916109be76648977705a2bea3ff76427
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Nov 25 23:19:24 2008 +0800
crypto: testmgr - Fix error flow of test_comp
This warning:
crypto/testmgr.c: In function â??test_compâ??:
crypto/testmgr.c:829: warning: â??retâ?? may be used uninitialized in
this function
triggers because GCC correctly notices that in the ctcount == 0 &&
dtcount != 0 input condition case this function can return an undefined
value, if the second loop fails.
Remove the shadowed 'ret' variable from the second loop that was probably
unintended.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 5f459f0adc7581da01cdd9b7f84db14a4559a390
Author: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Date: Tue Nov 25 23:17:10 2008 +0800
crypto: hifn_795x - Use softirq kernel mapping in bh context
Use KM_SOFTIRQ instead of KM_IRQ in tasklet context.
Added bug_on on input no-page condition.
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d6a10c84a2a2b08bdd637852c9cc42c41e109b25
Author: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Date: Mon Nov 24 22:04:39 2008 +0800
crypto: hifn_795x - Fix queue management
Fix queue management. Change ring size and perform its check not
one after another descriptor, but using stored pointers to the last
checked descriptors.
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3ec858de6468e810953e41b8c154a0d605b25d68
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:03:37 2008 +0800
crypto: hifn_795x - Remove some unused cruft
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit ed4f92e3723a7d73bcd179ba09529094752063b2
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:02:55 2008 +0800
crypto: hifn_795x - Fix queue processing
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 5df4c0c671bbb425e4a77dde5f51869aeebebd67
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:01:42 2008 +0800
crypto: hifn_795x - Fix request context corruption
HIFN uses the transform context to store per-request data, which breaks
when more than one request is outstanding. Move per request members from
struct hifn_context to a new struct hifn_request_context and convert
the code to use this.
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3416158680d5ba6fdb939e5bb52a8eba1ad5c027
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:00:49 2008 +0800
crypto: hifn_795x - Don't copy src sg list
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 75741a034024f146ba5431602f3ad33a5df8363c
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 21:59:25 2008 +0800
crypto: hifn_795x - Fix DMA setup
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 09fbf7c0f24176ef3b450c590f220ed8033dd2c3
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Mon Nov 24 21:20:13 2008 +0800
crypto: ansi_cprng - fix inverted DT increment routine
The ANSI X9.31 PRNG docs aren't particularly clear on how to increment DT,
but empirical testing shows we're incrementing from the wrong end. A 10,000
iteration Monte Carlo RNG test currently winds up not getting the expected
result.
From http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf :
# CAVS 4.3
# ANSI931 MCT
[X9.31]
[AES 128-Key]
COUNT = 0
Key = 9f5b51200bf334b5d82be8c37255c848
DT = 6376bbe52902ba3b67c925fa701f11ac
V = 572c8e76872647977e74fbddc49501d1
R = 48e9bd0d06ee18fbe45790d5c3fc9b73
Currently, we get 0dd08496c4f7178bfa70a2161a79459a after 10000 loops.
Inverting the DT increment routine results in us obtaining the expected
result
of 48e9bd0d06ee18fbe45790d5c3fc9b73. Verified on both x86_64 and ppc64.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 93027354d6e8a66a12dedb89d59b21cf7c2d35ed
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 13 22:05:13 2008 +0800
libcrc32c: Select CRYPTO in Kconfig
Selecting CRYPTO_CRC32C is not enough as CRYPTO which CRYPTO_CRC32C
depends on may be disabled. This patch adds the select on CRYPTO.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit aa1a85dbd1d3265ca36f684026fe7689b7836bed
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Thu Nov 13 22:03:20 2008 +0800
crypto: ansi_cprng - Avoid incorrect extra call to _get_more_prng_bytes
While working with some FIPS RNGVS test vectors yesterday, I discovered a
little bug in the way the ansi_cprng code works right now.
For example, the following test vector (complete with expected result)
from http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf ...
Key = f3b1666d13607242ed061cabb8d46202
DT = e6b3be782a23fa62d71d4afbb0e922fc
V = f0000000000000000000000000000000
R = 88dda456302423e5f69da57e7b95c73a
...when run through ansi_cprng, yields an incorrect R value
of e2afe0d794120103d6e86a2b503bdfaa.
If I load up ansi_cprng w/dbg=1 though, it was fairly obvious what was
going wrong:
----8<----
getting 16 random bytes for context ffff810033fb2b10
Calling _get_more_prng_bytes for context ffff810033fb2b10
Input DT: 00000000: e6 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Input I: 00000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Input V: 00000000: f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
tmp stage 0: 00000000: e6 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
tmp stage 1: 00000000: f4 8e cb 25 94 3e 8c 31 d6 14 cd 8a 23 f1 3f 84
tmp stage 2: 00000000: 8c 53 6f 73 a4 1a af d4 20 89 68 f4 58 64 f8 be
Returning new block for context ffff810033fb2b10
Output DT: 00000000: e7 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Output I: 00000000: 04 8e cb 25 94 3e 8c 31 d6 14 cd 8a 23 f1 3f 84
Output V: 00000000: 48 89 3b 71 bc e4 00 b6 5e 21 ba 37 8a 0a d5 70
New Random Data: 00000000: 88 dd a4 56 30 24 23 e5 f6 9d a5 7e 7b 95 c7 3a
Calling _get_more_prng_bytes for context ffff810033fb2b10
Input DT: 00000000: e7 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Input I: 00000000: 04 8e cb 25 94 3e 8c 31 d6 14 cd 8a 23 f1 3f 84
Input V: 00000000: 48 89 3b 71 bc e4 00 b6 5e 21 ba 37 8a 0a d5 70
tmp stage 0: 00000000: e7 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
tmp stage 1: 00000000: 80 6b 3a 8c 23 ae 8f 53 be 71 4c 16 fc 13 b2 ea
tmp stage 2: 00000000: 2a 4d e1 2a 0b 58 8e e6 36 b8 9c 0a 26 22 b8 30
Returning new block for context ffff810033fb2b10
Output DT: 00000000: e8 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Output I: 00000000: c8 e2 01 fd 9f 4a 8f e5 e0 50 f6 21 76 19 67 9a
Output V: 00000000: ba 98 e3 75 c0 1b 81 8d 03 d6 f8 e2 0c c6 54 4b
New Random Data: 00000000: e2 af e0 d7 94 12 01 03 d6 e8 6a 2b 50 3b df aa
returning 16 from get_prng_bytes in context ffff810033fb2b10
----8<----
The expected result is there, in the first "New Random Data", but we're
incorrectly making a second call to _get_more_prng_bytes, due to some checks
that are slightly off, which resulted in our original bytes never being
returned anywhere.
One approach to fixing this would be to alter some byte_count checks in
get_prng_bytes, but it would mean the last DEFAULT_BLK_SZ bytes would be
copied a byte at a time, rather than in a single memcpy, so a slightly more
involved, equally functional, and ultimately more efficient way of fixing
this
was suggested to me by Neil, which I'm submitting here. All of the RNGVS
ANSI
X9.31 AES128 VST test vectors I've passed through ansi_cprng are now
returning
the expected results with this change.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 31a61bfc6e415fbd871317cbee7b8a4158d8ac5b
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Nov 13 21:19:04 2008 +0800
crypto: md4 - Use ARRAY_SIZE
ARRAY_SIZE is more concise to use when the size of an array is divided by
the size of its type or the size of its first element.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@i@
@@
#include <linux/kernel.h>
@depends on i using "paren.iso"@
type T;
T[] E;
@@
- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 0426c166424ea6d3d0412f47879c8ba268f874c4
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 11 12:20:06 2008 +0800
libcrc32c: Add crc32c_le macro
The bnx2x driver actually uses the crc32c_le name so this patch
restores the crc32c_le symbol through a macro.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 53b146ae598268edbe2bf7ea7dfec721d51adddd
Author: Adrian-Ken Rueegsegger <rueegsegger@xxxxxxxxxxx>
Date: Tue Nov 11 12:14:00 2008 +0800
libcrc32c: Fix "crc32c undefined" compilation error
The latest shash changes leave crc32c undefined:
[...]
Building modules, stage 2.
MODPOST 1381 modules
ERROR: "crc32c" [net/sctp/sctp.ko] undefined!
ERROR: "crc32c" [net/ipv4/netfilter/nf_nat_proto_sctp.ko] undefined!
Adding EXPORT_SYMBOL(crc32c) to lib/libcrc32c.c fixes the compile error.
This patch has been compile-tested only.
Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 69c35efcf1576ab5f00cba83e8ca740923afb6c9
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 7 15:11:47 2008 +0800
libcrc32c: Move implementation to crypto crc32c
This patch swaps the role of libcrc32c and crc32c. Previously
the implementation was in libcrc32c and crc32c was a wrapper.
Now the code is in crc32c and libcrc32c just calls the crypto
layer.
The reason for the change is to tap into the algorithm selection
capability of the crypto API so that optimised implementations
such as the one utilising Intel's CRC32C instruction can be
used where available.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 8e3ee85e68c5d5c95451afd3e8f0997eec6f99e5
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 7 14:58:52 2008 +0800
crypto: crc32c - Test descriptor context format
This patch adds a test for the requirement that all crc32c algorithms
shall store the partial result in the first four bytes of the descriptor
context.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit b7e8bdadce6317eb13c13b9451d7114614aa1450
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 6 16:56:41 2008 +0800
crypto: crc32c-intel - Switch to shash
This patch changes crc32c-intel to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit faccc4bba160784e834b758f23d598e500ac7108
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Tue Sep 9 17:23:07 2008 +1000
crypto: crc32c - Switch to shash
This patch changes crc32c to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 5f7082ed4f482f05db01d84dbf58190492ebf0ad
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 22:21:09 2008 +1000
crypto: hash - Export shash through hash
This patch allows shash algorithms to be used through the old hash
interface. This is a transitional measure so we can convert the
underlying algorithms to shash before converting the users across.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 67cd080c5070b4f17520c1385f7684206f4987b3
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 6 14:39:16 2008 +0800
crypto: api - Call type show function before legacy for proc
This patch makes /proc/crypto call the type-specific show function
if one is present before calling the legacy show functions for
cipher/digest/compress. This allows us to reuse the type values
for those legacy types. In particular, hash and digest will share
one type value while shash is phased in as the default hash type.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit dec8b78606ebd5f309c38f2fb10196ce996dd18d
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Nov 2 21:38:11 2008 +0800
crypto: hash - Add import/export interface
It is often useful to save the partial state of a hash function
so that it can be used as a base for two or more computations.
The most prominent example is HMAC where all hashes start from
a base determined by the key. Having an import/export interface
means that we only have to compute that base once rather than
for each message.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3b2f6df08258e2875f42bd630eece7e7241a053b
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 18:52:18 2008 +1000
crypto: hash - Export shash through ahash
This patch allows shash algorithms to be used through the ahash
interface. This is required before we can convert digest algorithms
over to shash.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 7b5a080b3c46f0cac71c0d0262634c6517d4ee4f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 15:47:27 2008 +1000
crypto: hash - Add shash interface
The shash interface replaces the current synchronous hash interface.
It improves over hash in two ways. Firstly shash is reentrant,
meaning that the same tfm may be used by two threads simultaneously
as all hashing state is stored in a local descriptor.
The other enhancement is that shash no longer takes scatter list
entries. This is because shash is specifically designed for
synchronous algorithms and as such scatter lists are unnecessary.
All existing hash users will be converted to shash once the
algorithms have been completely converted.
There is also a new finup function that combines update with final.
This will be extended to ahash once the algorithm conversion is
done.
This is also the first time that an algorithm type has their own
registration function. Existing algorithm types will be converted
to this way in due course.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 7b0bac64cd5b74d6f1147524c26216de13a501fd
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Sep 21 06:52:53 2008 +0900
crypto: api - Rebirth of crypto_alloc_tfm
This patch reintroduces a completely revamped crypto_alloc_tfm.
The biggest change is that we now take two crypto_type objects
when allocating a tfm, a frontend and a backend. In fact this
simply formalises what we've been doing behind the API's back.
For example, as it stands crypto_alloc_ahash may use an
actual ahash algorithm or a crypto_hash algorithm. Putting
this in the API allows us to do this much more cleanly.
The existing types will be converted across gradually.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4a7794860ba2b56693b1d89fd485fd08cdc763e3
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Sep 13 18:19:03 2008 -0700
crypto: api - Move type exit function into crypto_tfm
The type exit function needs to undo any allocations done by the type
init function. However, the type init function may differ depending
on the upper-level type of the transform (e.g., a crypto_blkcipher
instantiated as a crypto_ablkcipher).
So we need to move the exit function out of the lower-level
structure and into crypto_tfm itself.
As it stands this is a no-op since nobody uses exit functions at
all. However, all cases where a lower-level type is instantiated
as a different upper-level type (such as blkcipher as ablkcipher)
will be converted such that they allocate the underlying transform
and use that instead of casting (e.g., crypto_ablkcipher casted
into crypto_blkcipher). That will need to use a different exit
function depending on the upper-level type.
This patch also allows the type init/exit functions to call (or not)
cra_init/cra_exit instead of always calling them from the top level.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 2566578a6feb9d9e39da41326afe8ed6022db3c5
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Wed Nov 5 12:13:14 2008 +0800
crypto: ansi_cprng - Allow resetting of DT value
This is a patch that was sent to me by Jarod Wilson, marking off my
outstanding todo to allow the ansi cprng to set/reset the DT counter value
in a
cprng instance. Currently crytpo_rng_reset accepts a seed byte array which
is
interpreted by the ansi_cprng as a {V key} tuple. This patch extends that
tuple
to now be {V key DT}, with DT an optional value during reset. This patch
also
fixes a bug we noticed in which the offset of the key area of the seed is
started at DEFAULT_PRNG_KSZ rather than DEFAULT_BLK_SZ as it should be.
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 420a4b20c504e4674bf253601f793bdb254f99fa
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 15:58:45 2008 +1000
crypto: padlock - Avoid resetting cword on successive operations
Resetting the control word is quite expensive. Fortunately this
isn't an issue for the common operations such as CBC and ECB as
the whole operation is done through a single call. However, modes
such as LRW and XTS have to call padlock over and over again for
one operation which really hurts if each call resets the control
word.
This patch uses an idea by Sebastian Siewior to store the last
control word used on a CPU and only reset the control word if
that changes.
Note that any task switch automatically resets the control word
so we only need to be accurate with regard to the stored control
word when no task switches occur.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 1c06da81a5d042d5fba67c4c533b16ae62a174ab
Author: Kent Liu <kent.liu@xxxxxxxxx>
Date: Fri Oct 31 16:52:58 2008 +0800
crypto: crc32c-intel - Update copyright head
The original copyright head for crc32c-intel.c is incorrect. Please merge
the patch to update it.
Signed-Off-By: Kent Liu <kent.liu@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4b24ea971a93f5d0bec34bf7bfd0939f70cfaae6
Author: Vishnu Suresh <Vishnu@xxxxxxxxxxxxx>
Date: Mon Oct 20 21:06:18 2008 +0800
crypto: talitos - Preempt overflow interrupts off-by-one fix
In commit ec6644d6325b5a38525f1d5b20fd4bf7db05cf2a "crypto: talitos -
Preempt
overflow interrupts", the test in atomic_inc_not_zero was interpreted by the
author to be applied after the increment operation (not before). This
off-by-one
fix prevents overflow error interrupts from occurring when requests are
frequent
and large enough to do so.
Signed-off-by: Vishnu Suresh <Vishnu@xxxxxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 32bd78e0a5d34cd8e34046502bddcf31aeb38e64
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Sun Oct 12 20:40:12 2008 +0800
crypto: camellia - use kernel-provided bitops, unaligned access
Remove the private implementation of 32-bit rotation and unaligned
access with byteswapping.
As a bonus, fixes sparse warnings:
crypto/camellia.c:602:2: warning: cast to restricted __be32
crypto/camellia.c:603:2: warning: cast to restricted __be32
crypto/camellia.c:604:2: warning: cast to restricted __be32
crypto/camellia.c:605:2: warning: cast to restricted __be32
crypto/camellia.c:710:2: warning: cast to restricted __be32
crypto/camellia.c:711:2: warning: cast to restricted __be32
crypto/camellia.c:712:2: warning: cast to restricted __be32
crypto/camellia.c:713:2: warning: cast to restricted __be32
crypto/camellia.c:714:2: warning: cast to restricted __be32
crypto/camellia.c:715:2: warning: cast to restricted __be32
crypto/camellia.c:716:2: warning: cast to restricted __be32
crypto/camellia.c:717:2: warning: cast to restricted __be32
[Thanks to Tomoyuki Okazaki for spotting the typo]
Tested-by: Carlo E. Prelz <fluido@xxxxxxxxx>
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d12d6b6d37cad766b390467e770eb0ab81345d78
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:36:51 2008 +0800
crypto: testmgr - Trigger a panic when self test fails in FIPS mode
The FIPS specification requires that should self test for any supported
crypto algorithm fail during operation in fips mode, we need to prevent
the use of any crypto functionality until such time as the system can
be re-initialized. Seems like the best way to handle that would be
to panic the system if we were in fips mode and failed a self test.
This patch implements that functionality. I've built and run it
successfully.
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit fe5720e2b7c1e8ff95d4bf18329517cf64ad1d70
Author: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:33:14 2008 +0800
crypto: talitos - Perform auth check in h/w if on sec 2.1 and above
SEC version 2.1 and above adds the capability to do the IPSec ICV
memcmp in h/w. Results of the cmp are written back in the descriptor
header, along with the done status. A new callback is added that
checks these ICCR bits instead of performing the memcmp on the core,
and is enabled by h/w capability.
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
After testing on different parts, another condition was added
before using h/w auth check because different
SEC revisions require different handling.
The SEC 3.0 allows a more flexible link table where
the auth data can span separate link table entries.
The SEC 2.4/2.1 does not support this case.
So a test was added in the decrypt routine
for a fragmented case; the h/w auth check is disallowed for
revisions not having the extent in the link table;
in this case the hw auth check is done by software.
A portion of a previous change for SEC 3.0 link table handling
was removed since it became dead code with the hw auth check supported.
This seems to be the best compromise for using hw auth check
on supporting SEC revisions; it keeps the link table logic
simpler for the fragmented cases.
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 1c2e8811eea5f0c5da3213ea206c2864fa4614fd
Author: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:29:34 2008 +0800
crypto: talitos - Implement done interrupt mitigation
In talitos_interrupt, upon one done interrupt, mask further done interrupts,
and ack only any error interrupt.
In talitos_done, unmask done interrupts after completing processing.
In flush_channel, ack each done channel processed.
Keep done overflow interrupts masked because even though each pkt
is ack'ed, a few done overflows still occur.
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 40405f10b853ef404b395c6febca71b0de185490
Author: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:19:35 2008 +0800
crypto: talitos - Pass correct interrupt status to error handler
Since we ack early, the re-read interrupt status in talitos_error
may be already updated with a new value. Pass the error ISR value
directly in order to report and handle the error based on the correct
error status.
Also remove unused error tasklet.
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit a44b56cc69a5b017f396ed1daeaef6a63e086656
Author: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Date: Sun Oct 12 20:14:15 2008 +0800
crypto: hifn - Disable driver when physical size exceeds 32 bits
On Tue, Sep 23, 2008 at 08:06:32PM +0200, Dimitri Puzin (max@xxxxxxxxxx)
wrote:
> With this patch applied it still doesn't work as expected. The overflow
> messages are gone however syslog shows
> [ 120.924266] hifn0: abort: c: 0, s: 1, d: 0, r: 0.
> when doing cryptsetup luksFormat as in original e-mail. At this point
> cryptsetup hangs and can't be killed with -SIGKILL. I've attached
> SysRq-t dump of this condition.
Yes, I was wrong with the patch: HIFN does not support 64-bit addresses
afaics.
Attached patch should not allow HIFN to be registered on 64-bit arch, so
crypto layer will fallback to the software algorithms.
Signed-off-by: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 15:26:37 2008 -0800
Linux 2.6.28
Happy holidays..
commit 67be403d897f818b1a5ecc201967b0ee6a0332f9
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 24 21:08:37 2008 +0100
Revert "x86: disable X86_PTRACE_BTS"
This reverts commit 40f15ad8aadff5ebb621b17a6f303ad2cd3f847d.
The CONFIG_X86_PTRACE_BTS bugs have been fixed via:
c5dee61: x86, bts: memory accounting
bf53de9: x86, bts: add fork and exit handling
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit db8862eafe8a5d030a3b02e81b8bb47447c315e3
Merge: c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9
c20137fc5329eaf24093fc48c52608dc66be8e5c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 24 21:08:26 2008 +0100
Merge branch 'linus' into tracing/hw-branch-tracing
commit c20137fc5329eaf24093fc48c52608dc66be8e5c
Merge: 1806f826554efd206cebacc7f9f213c8e6493a5d
231ffc9c07021afcfb1afa229aa4935730e5163b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 10:24:52 2008 -0800
Merge branch 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to
VIDIOC_INT_RESET command
V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
commit 1806f826554efd206cebacc7f9f213c8e6493a5d
Merge: 2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f
40f15ad8aadff5ebb621b17a6f303ad2cd3f847d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 10:24:14 2008 -0800
Merge branch 'x86-fixes-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable X86_PTRACE_BTS
commit 2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f
Merge: 5289f46b9de04bde181d833d48df9671b69c4b08
574f3c4f5c55e99ea60f71fd98cc54931d4b2eae
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 10:23:21 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Add missing terminators in patch_sigmatel.c
commit 1f5175adeaa1d161f603ef351785a19814dfe900
Author: Aleksey Senin <alekseys@xxxxxxxxxxxx>
Date: Wed Dec 24 10:16:45 2008 -0800
RDMA/cma: Add IPv6 support
Handle AF_INET6 cases where required, and use struct sockaddr_storage
wherever an IPv6 address might be stored.
Signed-off-by: Aleksey Senin <aleksey@alst60.(none)>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 38617c64bf9a10bf20e41d95b69bb81e8560fe9d
Author: Aleksey Senin <alekseys@xxxxxxxxxxxx>
Date: Wed Dec 24 10:16:37 2008 -0800
RDMA/addr: Add support for translating IPv6 addresses
Add support for translating AF_INET6 addresses to the IB address
translation service. This requires using struct sockaddr_storage
instead of struct sockaddr wherever an IPv6 address might be stored,
and adding cases to handle IPv6 in addition to IPv4 to the various
translation functions.
Signed-off-by: Aleksey Senin <aleksey@alst60.(none)>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 7645c4bfbb36f357f03815f5729c46ce8d89f008
Merge: 74b7ff48a93f44198ac03cc4e628d713f53d4668
574f3c4f5c55e99ea60f71fd98cc54931d4b2eae
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 24 11:04:08 2008 +0100
Merge branch 'fix/hda' into topic/hda
commit 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Tue Dec 23 16:53:00 2008 -0200
ALSA: hda - Add missing terminators in patch_sigmatel.c
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 40f15ad8aadff5ebb621b17a6f303ad2cd3f847d
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 24 10:49:51 2008 +0100
x86: disable X86_PTRACE_BTS
there's a new ptrace arch level feature in .28:
config X86_PTRACE_BTS
bool "Branch Trace Store"
it has broken fork() handling: the old DS area gets copied over into
a new task without clearing it.
Fixes exist but they came too late:
c5dee61: x86, bts: memory accounting
bf53de9: x86, bts: add fork and exit handling
and are queued up for v2.6.29. This shows that the facility is still not
tested well enough to release into a stable kernel - disable it for now and
reactivate in .29. In .29 the hardware-branch-tracer will use the DS/BTS
facilities too - hopefully resulting in better code.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c1c15b65ec30275575dac9322aae607075769fbc
Author: H. Peter Anvin <hpa@xxxxxxxxx>
Date: Tue Dec 23 10:10:40 2008 -0800
x86: PAT: fix address types in track_pfn_vma_new()
Impact: cleanup, fix warning
This warning:
arch/x86/mm/pat.c: In function track_pfn_vma_copy:
arch/x86/mm/pat.c:701: warning: passing argument 5 of follow_phys from
incompatible pointer type
Triggers because physical addresses are resource_size_t, not u64.
This really matters when calling an interface like follow_phys() which
takes a pointer to a physical address -- although on x86, being
littleendian, it would generally work anyway as long as the memory region
wasn't completely uninitialized.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6332178d91ca1a9dbd99bd97cabbcf965d178e9f
Merge: 908a7a16b852ffd618a9127be8d62432182d81b4
739840d529eb7505d3cbfe9d468bf1440c9a8e27
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 23 17:56:23 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ppp_generic.c
commit 5289f46b9de04bde181d833d48df9671b69c4b08
Author: Kyle McMartin <kyle@xxxxxxxxxxxxx>
Date: Tue Dec 23 08:44:30 2008 -0500
parisc: disable UP-optimized flush_tlb_mm
flush_tlb_mm's "optimized" uniprocessor case of allocating a new
context for userspace is exposing a race where we can suddely return
to a syscall with the protection id and space id out of sync, trapping
on the next userspace access.
Debugged-by: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Tested-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 8960223d5973b3eaf8cbc1984969bb6c7661e7b9
Merge: d519c8d9ccb7956e61a55ce3a0fd6a25f42cbb33
077ebed54fe66612f58b076628a72eca2be8df90
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 23 17:01:40 2008 -0800
Merge branch 'drm-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: fix correctness of irq_enabled check for radeon.
commit d519c8d9ccb7956e61a55ce3a0fd6a25f42cbb33
Author: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx>
Date: Tue Dec 23 13:57:16 2008 -0800
edac: fix edac core deadlock when removing a device
When deleting an edac device, we have to wait for its edac_dev.work to be
completed before deleting the whole edac_dev structure. Since we have no
idea which work in current edac_poller's workqueue is the work we are
conerned about, we wait for all work in the edac_poller's workqueue to be
proceseed. This is done via flush_cpu_workqueue() which inserts a
wq_barrier into the tail of the workqueue and then sleeping on the
completion of this wq_barrier. The edac_poller will wake up sleepers when
it is found.
EDAC core creates only one kernel worker thread, edac_poller, to run the
works of all current edac devices. They share the same callback function
of edac_device_workq_function(), which would grab the mutex of
device_ctls_mutex first before it checks the device. This is exactly
where edac_poller and rmmod would have a great chance to deadlock.
In below call trace of rmmod > ... >
edac_device_del_device >
edac_device_workq_teardown > flush_workqueue > flush_cpu_workqueue,
device_ctls_mutex would have already been grabbed by
edac_device_del_device(). So, on one hand rmmod would sleep on the
completion of a wq_barrier, holding device_ctls_mutex; on the other hand
edac_poller would be blocked on the same mutex when it's running any one
of works of existing edac evices(Note, this edac_dev.work is likely to be
totally irrelevant to the one that is being removed right now)and never
would have a chance to run the work of above wq_barrier to wake rmmod up.
edac_device_workq_teardown() should not be called within the critical
region of device_ctls_mutex. Just like is done in edac_pci_del_device()
and edac_mc_del_mc(), where edac_pci_workq_teardown() and
edac_mc_workq_teardown() are called after related mutex are released.
Moreover, an edac_dev.work should check first if it is being removed. If
this is the case, then it should bail out immediately. Since not all of
existing edac devices are to be removed, this "shutting flag" should be
contained to edac device being removed. The current edac_dev.op_state can
be used to serve this purpose.
The original deadlock problem and the solution have been witnessed and
tested on actual hardware. Without the solution, rmmod an edac driver
would result in below deadlock:
root@localhost:/root> rmmod mv64x60_edac
EDAC DEBUG: mv64x60_dma_err_remove()
EDAC DEBUG: edac_device_del_device()
EDAC DEBUG: find_edac_device_by_dev()
(hang for a moment)
INFO: task edac-poller:2030 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
edac-poller D 00000000 0 2030 2
Call Trace:
[df159dc0] [c0071e3c] free_hot_cold_page+0x17c/0x304 (unreliable)
[df159e80] [c000a024] __switch_to+0x6c/0xa0
[df159ea0] [c03587d8] schedule+0x2f4/0x4d8
[df159f00] [c03598a8] __mutex_lock_slowpath+0xa0/0x174
[df159f40] [e1030434] edac_device_workq_function+0x28/0xd8 [edac_core]
[df159f60] [c003beb4] run_workqueue+0x114/0x218
[df159f90] [c003c674] worker_thread+0x5c/0xc8
[df159fd0] [c004106c] kthread+0x5c/0xa0
[df159ff0] [c0013538] original_kernel_thread+0x44/0x60
INFO: task rmmod:2062 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
rmmod D 0ff2c9fc 0 2062 1839
Call Trace:
[df119c00] [c0437a74] 0xc0437a74 (unreliable)
[df119cc0] [c000a024] __switch_to+0x6c/0xa0
[df119ce0] [c03587d8] schedule+0x2f4/0x4d8
[df119d40] [c03591dc] schedule_timeout+0xb0/0xf4
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 20ca9b3f4c6dfa0af8dd5b18a64df17eb994b54d
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
Date: Tue Dec 23 13:57:14 2008 -0800
cgroups: avoid accessing uninitialized data in failure path
If cgroup_get_rootdir() failed, free_cg_links() will be called in the
failure path, but tmp_cg_links hasn't been initialized at that time.
I introduced this bug in the 2.6.27 merge window.
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Acked-by: Serge Hallyn <serue@xxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit e368d3a836797ddf193b1ec18c97407a791d2451
Author: Sharyathi Nagesh <sharyath@xxxxxxxxxx>
Date: Tue Dec 23 13:57:12 2008 -0800
cgroups: suppress bogus warning messages
Remove spurious warning messages that are thrown onto the console during
cgroup operations.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Sharyathi Nagesh <sharyathi@xxxxxxxxxx>
Acked-by: Serge E. Hallyn <serge@xxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit f00a189257836e5237ace3265f6991ef66a16c86
Author: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Date: Tue Dec 23 13:57:12 2008 -0800
w1: fix slave selection on big-endian systems
During test of the w1-gpio driver i found that in "w1.c:679
w1_slave_found()" the device id is converted to little-endian with
"cpu_to_le64()", but its not converted back to cpu format in "w1_io.c:293
w1_reset_select_slave()".
Based on a patch created by Andreas Hummel.
[akpm@xxxxxxxxxxxxxxxxxxxx: remove unneeded cast]
Reported-by: Andreas Hummel <andi_hummel@xxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit cc6c2ca30074a0274c05dd3212c741a550f0d3c2
Author: Chris Elston <celston@xxxxxxxxxxx>
Date: Tue Dec 23 13:57:10 2008 -0800
rtc: rtc-isl1208: reject invalid dates
This patch for the rtc-isl1208 driver makes it reject invalid dates.
Signed-off-by: Chris Elston <celston@xxxxxxxxxxx>
[a.zummo@xxxxxxxxxxxx: added comment explaining the check]
Signed-off-by: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Hebert Valerio Riedel <hvr@xxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 98db8df777438e16ad0f44a0fba05ebbdb73db8d
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 23 11:32:25 2008 -0500
ring-buffer: prevent false positive warning
Impact: eliminate false WARN_ON message
If an interrupt goes off after the setting of the local variable
tail_page and before incrementing the write index of that page,
the interrupt could push the commit forward to the next page.
Later a check is made to see if interrupts pushed the buffer around
the entire ring buffer by comparing the next page to the last commited
page. This can produce a false positive if the interrupt had pushed
the commit page forward as stated above.
Thanks to Jiaying Zhang for finding this race.
Reported-by: Jiaying Zhang <jiayingz@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a8ccf1d6f60e3e6ae63122e02378cd4d40dd4aac
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 23 11:32:24 2008 -0500
ring-buffer: fix dangling commit race
Impact: fix stuck trace-buffers
If an interrupt comes in during the rb_set_commit_to_write and
pushes the tail page forward just at the right time, the commit
updates will miss the adding of the interrupt data. This will
cause the commit pointer to cease from moving forward.
Thanks to Jiaying Zhang for finding this race.
Reported-by: Jiaying Zhang <jiayingz@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bed4f13065b520e564adffbfcd1c1a764a9c887e
Merge: 3e5621edb3392b28efb260ac99b2d26fb8b44e73
bf8bd66d0580f296f257d371ee41a0a137b541c7
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:30:31 2008 +0100
Merge branch 'x86/irq' into x86/core
commit 3e5621edb3392b28efb260ac99b2d26fb8b44e73
Merge: be9a1d3c2e559b267983bcf8b003997b83befb49
181de82ee3ffda1175f89d50c991dae31b79280c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:30:27 2008 +0100
Merge branch 'x86/iommu' into x86/core
commit be9a1d3c2e559b267983bcf8b003997b83befb49
Merge: fa623d1b0222adbe8f822e53c08003b9679a410c
7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:30:20 2008 +0100
Merge branch 'x86/tsc' into x86/core
commit 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Merge: 345077cd98ff5532b2d1158013c3fec7b1ae85ec
f4166c54bfe04f64603974058e44fbd7cfef0ccc
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:29:31 2008 +0100
Merge branch 'x86/ptrace' into x86/tsc
Conflicts:
arch/x86/kernel/cpu/intel.c
commit fa623d1b0222adbe8f822e53c08003b9679a410c
Merge: 3d44cc3e01ee1b40317f79ed54324e25c4f848df
1ccedb7cdba6886939dd8b4c8f965a826f696e56
34945ede31071ac7d72270cc6c1893323f392b3f
d4377974062122d6d9be0bbd8a910a0954714194
c415b3dce30dfb41234e118662e8720f47343a4f
beeb4195cbc80b7489631361b7ed38b7518af433
f269b07e862c395d6981ab2c05d6bc34b0249e90
4e42ebd57b2e727b28bf5f6068e95cd19b0e807b
e1286f2c686f5976e0424bb6195ece25e7a17607
878719e831d9e076961aa15d4049a57a6668c67a
fd28a5b58dddf5cb5df162ae5c8797a63171c31d
adf77bac052bb5bf0722b2ce2af9fefc5b2d2a71
8f2466f45f75e3cbe3aa2b69d33fd9d6e343b9cc
93093d099e5dd0c258fd530c12668e828c20df41
bb5574608a8375026510b4f983ffbb06ece33fe2
f34a10bd9f8cc95ebdc69a079db195636b2e22e0
b6fd6f26733e864fba2ea3eb1d716e23d2e66f3a
30604bb410b53efa9c93ee8f03d7aa7494094faa
5b9a0e14eb4bf40a7cb780af4723560e06753f2d
67bac792cd0c05b4b6e0393c32605b028b8dd533
7a9787e1eba95a166265e6a260cf30af04ef0a99
f4166c54bfe04f64603974058e44fbd7cfef0ccc
69b88afa8d114a43a3c0431722b79e31d9920692
8daa19051e1c7369c89ace7b18e74fe1f55dfa29
3e1e9002aa8b32bd4c95ac6c8fad376b7a8127fb
8403295e0fa460f6240e2d781e25dc29189f33c7
4db646b1af8fdcf01d690d29eeae44cd937edb0d
205516c12dbba003c26b42cfb41e598631300106
c8182f0016fb65a721c4fbe487909a2d56178135
ecbf29cdb3990c83d90d0c4187c89fb2ce423367
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:27:23 2008 +0100
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature',
'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc',
'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io',
'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr',
'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace',
'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal',
'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
commit bf8bd66d0580f296f257d371ee41a0a137b541c7
Merge: 8ae936690972dfcad73d0dde1095b9f32af5ee95
1ccedb7cdba6886939dd8b4c8f965a826f696e56
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:24:15 2008 +0100
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
commit 1ccedb7cdba6886939dd8b4c8f965a826f696e56
Merge: a98f8fd24fb24fcb9a359553e64dd6aac5cf4279
929096fe9ff1f4b3645cf3919527ab47e8d5e17c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:23:23 2008 +0100
Merge commit 'v2.6.28-rc9' into x86/apic
commit 231ffc9c07021afcfb1afa229aa4935730e5163b
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxx>
Date: Tue Dec 16 23:09:35 2008 -0300
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to
VIDIOC_INT_RESET command
Fix a NULL pointer dereference that would occur if the video decoder tied to
the em28xx supports the VIDIOC_INT_RESET call (for example: the cx25840
driver)
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 908a7a16b852ffd618a9127be8d62432182d81b4
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Mon Dec 22 20:43:12 2008 -0800
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f8f50b1bddd49eb171398cfc543c957884dc6e35
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:26 2008 +0000
powerpc/32: Wire up the trampoline code for kdump
Wire up the trampoline code for ppc32 to relay exceptions from the
vectors at address 0 to vectors at address 32MB, and modify Kconfig
to enable Kdump support for all classic powerpcs.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit ccdcef72c249c289898b164eada89a61855b9287
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:13 2008 +0000
powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
Add the ability for a classic ppc kernel to be loaded at an address
of 32MB. This done by fixing a few places that assume we are loaded
at address 0, and by changing several uses of KERNELBASE to use
PAGE_OFFSET, instead.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 01695a9687e5a8d78589605037cc7828a5b67ac9
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:10 2008 +0000
powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
While for debugging it is good to catch bogus users of ioremap, though
for kdump support it is more convenient to use __ioremap for
copy_oldmem_page() (exactly as we do for PPC64 currently).
Note that copy_oldmem_page() calls __ioremap with flags set to '0',
so it should be safe with the regard to the caches.
The other option is to use kmap_atomic_pfn()[1], but it will not work
for kernels compiled without HIGHMEM.
That is, on a board with 256MB RAM and crashkernel=64M@32M case, the
!HIGHMEM capturing kernel maps 0-96M range, which does not include all
the memory needed to capture the dump. And, obviously, accessing
anything upper than 96M will cause faults.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2007-November/046747.html
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6f29c3298b18216198631cbee01c349adecb225d
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:06 2008 +0000
powerpc/32: Setup OF properties for kdump
Refactor the setting of kdump OF properties, moving the common code
from machine_kexec_64.c to machine_kexec.c where it can be used on
both ppc64 and ppc32. This will be needed for kdump to work on ppc32
platforms.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 73753313884e8d063d9bf9d3e36325743ca006ba
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:01 2008 +0000
powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
This replaces the dummy crash_setup_regs function with full-fledged
crash_setup_regs implementation. On PPC32 we simply use the new
ppc_save_regs function to dump the registers.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 322b439455ea62e6480e300c77b258e872896381
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Wed Dec 17 10:08:55 2008 +0000
powerpc: Prepare xmon_save_regs for use with kdump
Today the arch/powerpc/xmon/setjmp.S file contains only the
xmon_save_regs function. We want to use it for kdump purposes, so
let's move the file into arch/powerpc/kernel/ and give the function a
more generic name (ppc_save_regs).
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 5be8554875bf3a1a42b7f04d5999b36e7c2fa88b
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 16 06:23:08 2008 +0000
powerpc: Remove default kexec/crash_kernel ops assignments
Default ops are implicit now.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 77733f8a33488307e7d4b9077d174647ecea92e1
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 16 06:23:05 2008 +0000
powerpc: Make default kexec/crash_kernel ops implicit
This removes the need for each platform to specify default kexec and
crash kernel ops, thus effectively adds a working kexec support for
most 6xx/7xx/7xxx-based boards.
Platforms that can't cope with default ops will explode in some weird
way (a hang or reboot is most likely), which means that the board's
kexec support should be fixed or blacklisted via dummy _prepare
callback returning -ENOSYS.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2e8e4f5b80e101da588af650de0ff6b3c475d6b3
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Tue Dec 16 06:22:59 2008 +0000
powerpc: Setup OF properties for ppc32 kexec
Refactor the setting of kexec OF properties, moving the common code
from machine_kexec_64.c to machine_kexec.c where it can be used on
both ppc64 and ppc32. This is needed for kexec to work on ppc32
platforms.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit b906cfa397fdef8decbd36467b1f63c830a0bf2b
Author: Sebastien Dugue <sebastien.dugue@xxxxxxxx>
Date: Thu Nov 27 00:59:52 2008 +0000
powerpc/pseries: Fix cpu hotplug
Currently, pseries_cpu_die() calls msleep() while polling RTAS for
the status of the dying cpu.
However, if the cpu that is going down also happens to be the one
doing the tick then we're hosed as the tick_do_timer_cpu 'baton' is
only passed later on in tick_shutdown() when _cpu_down() does the
CPU_DEAD notification. Therefore jiffies won't be updated anymore.
This replaces that msleep() with a cpu_relax() to make sure we're not
going to schedule at that point.
With this patch my test box survives a 100k iterations hotplug stress
test on _all_ cpus, whereas without it, it quickly dies after ~50
iterations.
Signed-off-by: Sebastien Dugue <sebastien.dugue@xxxxxxxx>
Cc: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit fad7b9b51e21a97e9e2662f1b51869ed2d209097
Author: Paul Mackerras <paulus@xxxxxxxxx>
Date: Tue Dec 23 14:57:26 2008 +1100
powerpc: Fix KVM build on ppc440
Commit 2a4aca1144394653269720ffbb5a325a77abd5fa ("powerpc/mm: Split
low level tlb invalidate for nohash processors") changed a call to
_tlbia to _tlbil_all but didn't include the header that defines
_tlbil_all, leading to a build failure on 440 if KVM is enabled.
This fixes it.
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8
Author: Oliver Neukum <oliver@xxxxxxxxxx>
Date: Thu Dec 18 03:57:35 2008 +0000
net: startup race in hso driver
The flag marking a device running must be set before the URBs for
recption are submitted or they may complete too early and fail to resubmit.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 05a8c1cbfe368df8c0d4eff710c370d2aa10245a
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Mon Dec 22 19:44:13 2008 -0800
pkt_sched: Remove smp_wmb() in qdisc_watchdog()
While implementing a TCQ_F_THROTTLED flag there was used an smp_wmb()
in qdisc_watchdog(), but since this flag is practically used only in
sch_netem(), and since it's not even clear what reordering is avoided
here (TCQ_F_THROTTLED vs. __QDISC_STATE_SCHED?) it seems the barrier
could be safely removed.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4707470ae7441733822efcd680b0ef3971921c4d
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date: Mon Dec 22 19:40:38 2008 -0800
r6040: bump release number to 0.19
This patch bumps the release number of the driver.
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3e7c469f07ff14cbf9a814739e1fc99a863e0943
Author: Joe Chou <Joe.Chou@xxxxxxxxxx>
Date: Mon Dec 22 19:40:02 2008 -0800
r6040: save and restore MIER correctly in the interrupt routine
This patch saves the MIER register contents before treating
interrupts, then restores them correcty at the end of the
interrupt routine.
Signed-off-by: Joe Chou <Joe.Chou@xxxxxxxxxx>
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 11e5e8f5d14a1229706576184d2cf4c4556ed94c
Author: Joe Chou <Joe.Chou@xxxxxxxxxx>
Date: Mon Dec 22 19:38:17 2008 -0800
r6040: fix wrong logic in mdio code
This patch fixes a reverse logic in the MDIO code.
Signed-off-by: Joe Chou <Joe.Chou@xxxxxxxxxx>
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5f2f6da76c429c42d54f73807f00b8fd761a7d68
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Mon Dec 22 19:35:28 2008 -0800
net: Fix oops in dev_ifsioc()
A command like this: "brctl addif br1 eth1" issued as a user gave me
an oops when bridge module wasn't loaded. It's caused by using a dev
pointer before checking for NULL.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit adf77bac052bb5bf0722b2ce2af9fefc5b2d2a71
Author: H. Peter Anvin <hpa@xxxxxxxxx>
Date: Mon Dec 22 17:56:05 2008 -0800
x86: prioritize the FPU traps for the error code
In the case of multiple FPU errors, prioritize the error codes,
instead of returning __SI_FAULT, which ends up pushing a 0 as the
error code to userspace, a POSIX violation.
For i386, we will simply return if there are no errors at all; for
x86-64 this is probably a "can't happen" (and the code should be
unified), but for this patch, return __SI_FAULT|SI_KERNEL if this ever
happens.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 077ebed54fe66612f58b076628a72eca2be8df90
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Mon Dec 22 17:11:02 2008 +1000
drm/radeon: fix correctness of irq_enabled check for radeon.
This check was introduced with the logic the wrong way around.
Fixes regression: http://bugzilla.kernel.org/show_bug.cgi?id=12216
Tested-by: François Valenduc <francois.valenduc@xxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit c47a75a45fa3a9d98b61f7e31983ffab2c44404f
Merge: 0099f77e0a224cc461d0d2930ef0fdb32c61ba64
abe1dfab60e1839d115930286cb421f5a5b193f3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 14:52:00 2008 -0800
Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: don't cond_resched() when irqs_disabled()
ACPI: fix 2.6.28 acpi.debug_level regression
commit 0099f77e0a224cc461d0d2930ef0fdb32c61ba64
Merge: 2e8569669805c2d2620527464c395279b74892fc
9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 14:40:48 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
commit 9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325
Author: Julia Lawall <julia@xxxxxxx>
Date: Mon Dec 22 23:05:06 2008 +0100
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@
- T i = E->fld;
+ T i;
... when != E
when != i
if (E == NULL) S
+ i = E->fld;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Acked-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
commit def434c2319c5a336633cd73322e0f28a7091b01
Author: Benjamin Krill <ben@xxxxxxxxxxx>
Date: Thu Nov 27 16:15:44 2008 +0100
powerpc/cell: add QPACE as a separate Cell platform
Since the QPACE (Chromodynamics Parallel Computing on the
Cell Broadband Engine) platform doesn't use a iommu, doesn't
have PCI devices and a MPIC much lesser setup and
configurations are needed. So far all devices are detected
as OF device. A notifier function is used to set the dma_ops
for the of_platform bus. Further this patch splits the
PPC_CELL_NATIVE into PPC_CELL_COMMON which are parts that are
shared with the QPACE platform and the rest.
Signed-off-by: Benjamin Krill <ben@xxxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
commit e68558ddcdbfa8cc2e7811bcada3bcbeef79fd4a
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date: Mon Dec 22 22:08:26 2008 +0100
powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
CBE_THERM and OPROFILE_CELL both cannot be built without
SPU_FS disabled, so make the dependency explicit.
Reported-by: Milton Miller <miltonm@xxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
commit 2e8569669805c2d2620527464c395279b74892fc
Merge: 7ef5f41c16fdddfc14e882a57200334614d8ffd6
ed2b03ed3cec2a4719d04ef208319f9de6a4258a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 10:17:19 2008 -0800
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: MIPS64R2: Fix buggy __arch_swab64
MIPS: Fix preprocessor warnings flaged by GCC 4.4
commit 7ef5f41c16fdddfc14e882a57200334614d8ffd6
Merge: 3d44cc3e01ee1b40317f79ed54324e25c4f848df
739840d529eb7505d3cbfe9d468bf1440c9a8e27
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 10:12:54 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ppp: fix segfaults introduced by netdev_priv changes
net: Fix module refcount leak in kernel_accept()
commit 472346da9cc4231bec03ff2032e0d5fd4037232c
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Mon Dec 22 17:40:45 2008 +0100
ALSA: ASoC: fix a typo in omp-pcm.c
Fix a typo (& and &&)
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c69134858722977a82f58cae88e7ffdb28e1e858
Author: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Date: Mon Dec 22 10:57:33 2008 +0200
ASoC: Fix DSP formats in SSM2602 audio codec
Thanks to Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx> for noticing.
- DSP_A format has 1-bit data delay which corresponds to SSM6202 submode 2
- DSP_B has 0-bit data delay which corresponds to submode 1
- Currently driver sets them opposite so swap the submode setting
Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Cc: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit bd25867a6cbe7a00ef7dbe8d9ddebc91b00b9b3f
Author: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Date: Mon Dec 22 10:21:36 2008 +0200
ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
- OMAP McBSP DAI driver claims to support DSP_A format which has 1-bit data
delay but configures link for 0-bit data delay which is in fact DSP_B
- Fix this by changing format from DSP_A to DSP_B
- Fix also TLV320AIC23 codec and OSK5912 machine drivers since the same
error is populated also there
Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Acked-by: Arun KS <arunks@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit f5eda57f9bb17b6f09f7888dfc2c47db7aea45d4
Author: Roland Dreier <rolandd@xxxxxxxxx>
Date: Mon Dec 22 07:15:05 2008 -0800
mlx4_core: Delete incorrect comment
The comment about a "Conditional on hca_type" was cut-and-pasted from
the mthca driver, and doesn't apply to mlx4 (since only one type of HCA
is handled by mlx4). So just delete it.
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit b8dd786f9417e5885929bfe33a235c76a9c1c569
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Mon Dec 22 07:15:03 2008 -0800
mlx4_core: Add support for multiple completion event vectors
When using MSI-X mode, create a completion event queue for each CPU.
Report the number of completion EQs in a new struct mlx4_caps member,
num_comp_vectors, and extend the mlx4_cq_alloc() interface with a
vector parameter so that consumers can specify which completion EQ
should be used to report events for the CQ being created.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 59de580af1c2fd671b0cb27c41ff958859ae5288
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 19:32:27 2008 +0900
sh: oprofile: Fix up the module build.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7d91fcfcb91dde7bc4586154942862c1724b3519
Author: Takanari Hayama <taki@xxxxxxxxxx>
Date: Mon Dec 22 11:05:03 2008 +0900
sh: add UIO support for JPU on SH7722.
Add JPU support on Migo-R via UIO. This make use of Magnus's
generic UIO platform driver. Chunk of contiguous memory to hold
intermediate image and compressed data during encode and decode.
Signed-off-by: Takanari Hayama <taki@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b0c50ad71746c4ad148f366135e3c87e32729108
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 03:40:10 2008 +0900
serial: sh-sci: Fix up port pinmux for SH7366.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6f5cd2bd59c3bbaf073a7a52fcdefded939bd306
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 03:26:26 2008 +0900
sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2ea40dec26da89702dface74365cd16cea9ded6c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 03:25:04 2008 +0900
sh: mach-sh03: Fix up pata_platform build breakage.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b5868e8cdeb35cd9ddc3a541f81f318b0f6772b3
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:50 2008 +0900
sh: enable deferred io LCDC on Migo-R
Enable LCDC deferred io on Migo-R using 1s delay.
As with other deferred io frame buffers user space code should
use fsync() on the frame buffer device to trigger an update.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8564557a03c12adb9c4b76ae1e86db4113a04d13
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:41 2008 +0900
video: sh_mobile_lcdcfb deferred io support
This patch adds sh_mobile_lcdcfb deferred io support for SYS panels.
The LCDC hardware block managed by the sh_mobile_lcdcfb driver supports
RGB or SYS panel configurations. SYS panels come with an external display
controller that is resposible for refreshing the actual LCD panel. RGB
panels are controlled directly by the LCDC and they need to be refreshed
by the LCDC hardware.
In the case of SYS panels we can save some power by configuring the LCDC
hardware block in one-shot mode. In this one-shot mode panel refresh is
managed by software. This works well together with deferred io since it
allows us to stop clocks for most of the time and only enable clocks when
we actually want to trigger an update. When there is no fbdev activity
the clocks are kept stopped which allows us to deep sleep.
The refresh rate in deferred io mode is set using platform data. The same
platform data can also be used to disable deferred io mode.
As with other deferred io frame buffers user space code should use fsync()
on the frame buffer device to trigger an update.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 37b4837959cb9aa60686ca0d85f73d819251abad
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:32 2008 +0900
video: deferred io with physically contiguous memory
Extend the deferred io code from only supporting vmalloc()ed frame
buffer memory to support both vmalloc()ed and physically contiguous
frame buffer memory.
The sh_mobile_lcdcfb hardware does not support scatter gather so
we need physically contiguous memory to back our frame buffer.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Acked-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6e1038a95bebb8a1ad6066c95aa9c3af6963c9ff
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:23 2008 +0900
video: deferred io cleanup
Make sure the mmap callback is set to NULL in the deferred io
cleanup function. This way we can enable and disable deferred
io on the fly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Acked-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 87884bd8ae42c875adbd62c84f47ed1cbb3e5090
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:09 2008 +0900
video: fix deferred io fsync()
If CONFIG_FB_DEFERRED_IO is set, but there are framebuffers
registered that does not make use of deferred io, then fsync()
on those framebuffers will result in a crash. Fix that.
This is needed for sh_mobile_lcdcfb since we always enable
deferred io at compile time but we may disable deferred io
for some types of hardware configurations.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Acked-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0790555437df2b6070af8f021b8d2ef79e70e144
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 12:02:16 2008 +0900
sh: add LCDC interrupt configuration to AP325 and Migo-R
Add LCDC interrupt resources for AP325 and Migo-R. The LCDC driver does
not require interrupts at this point, but changes such as one-shot SYS
mode using deferred io, and wait-for-vblank will both need this.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2540c111ead82cad605ec2b14a1905ad914cc124
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Wed Dec 17 17:29:49 2008 +0900
sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
Since the sh_mobile_lcdc hardware has the framebuffer(s) in system RAM,
use FB_SYS instead of FB_CFB. Also hook in read and write helpers.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit da9fdc8b44c421f14a68988ae4d1fb414d5edbf0
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Wed Dec 17 17:18:45 2008 +0900
sh: split coherent pages
Split pages returned by dma_alloc_coherent() and make sure
we free them one by one.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 78fb40263f34c65ade1693664db1af168d479588
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 16:23:32 2008 +0900
sh: dma: Kill off ISA DMA wrapper.
There are no more users for this code, and it has been deprecated for
some time, so just kill it off.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5d2685d0b3edc51ecc92604d5b7f5ca9b29b90bb
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:56:06 2008 +0900
sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
We don't really want this enabled by default, but it is still quite
useful for debugging. So, make it conditional and leave it off by
default.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit fe58cac35f48a9598c2a1360c2204c73f7bca2d2
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:36:50 2008 +0900
sh: Kill off the unused SH_ALPHANUMERIC debug option.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 740a3e677b70181d5e2b1458a27891209e3bf635
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:33:43 2008 +0900
sh: Enable skipping of bss on debug platforms for sh32 also.
This enables the same functionality that sh64 has for sh32. When running
on simulated hardware or via remote memory via the debug interface,
memory is gauranteed to be zero on boot already, and skipping the zeroing
of BSS has measurable boot time benefits.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8a655053ca1593dd160dac2a4ee638fdec037d86
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:06:54 2008 +0900
doc: Update sh cpufreq documentation.
The sh cpufreq driver is no longer limited to just the SH-3 and SH-4,
update the documentation to reflect this fact accordingly.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0146d7875976795fe364b4a3da629975ebd37671
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 14:58:04 2008 +0900
sh: mrshpc_setup_windows() needs to be inline.
While no one should be including this file multiple times, flag it
inline anyways just in case.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1f6fd5c916c8416588f5797e7837b9e81b3251a5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 14:53:24 2008 +0900
serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL.
sci_poll_put_char() happens to also be used by the serial console,
while sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL. Add
another gnarly ifdef to shut up the compiler.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 073da9c0de401e8683b6bc76c008a7e0850045d5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 14:41:54 2008 +0900
sh: Kill off cf-enabler with extreme prejudice.
Now that the rest of the boards that were using cf-enabler "generically"
have switched to setting up their mappings on their own, only the mach-se
boards were left using it. All of the cf-enabler using mach-se boards
use a special initialization of the MRSHPC windows rather than going
through the special PTE as other SH-4 platforms do. This consolidates
the MRSHPC setup logic, hooks it up on the boards that care, and gets rid
of any and all remaining references to cf-enabler.
This has been long overdue, as cf-enabler has been the bane of
arch/sh/kernel for the last 7 years. Good riddance.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8c197c3afb4a9026973315cc6a3c189dd8434053
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 13:57:45 2008 +0900
sh: Add a simple edosk7705_defconfig for build testing.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 866ef8f48f2272ce8d84156c91964d730666ab33
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 13:57:15 2008 +0900
sh: mach-edosk7705: Fix up edosk7705 so it all builds again.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0ef0e6ca426d28561b752e5f576932659295b928
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 13:14:22 2008 +0900
sh: mach-microdev: Split out the fdc37c93xapm initialization code.
This makes the microdev code a bit more readable, and moves the
setup for the SuperIO out on its own.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 43eeb0fb9f4e2aaefc4ae9dc964308ce8f55998b
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:54:09 2008 +0900
sh: mach-sh03: Use __set_io_port_base(), kill off special ioport_map().
This also fixes up a long-standing bug for this platform where the PIO
base was set to a register offset, rather than the actual PIO offset
itself.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8db806ec80ce80605005d1d558add716152a1134
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:48:41 2008 +0900
sh: mach-sh03: Move off of cf_enabler to pata_platform, as per landisk.
This gets rid of the cf enabler use on mach-sh03 and switches to use
pata_platform with the proper address directly. cf_enabler is
subsequently disabled for mach-sh03.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 98a955da8525a4218c8186fba5a6b949f563bbea
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:42:20 2008 +0900
sh: board-shmin: Convert shmin to use __set_io_port_base().
Drop the special mv_ioport_map() implementation, as this can simply use
__set_io_port_base() directly.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2125a46083dc5a9aa321c243e322638a9338cd11
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:31:32 2008 +0900
sh: Kill off dead mv_init_pci() from machvec.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 43f8f9b95b65dc05368cd82268895b9508b17d50
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:20:15 2008 +0900
sh: Simplify kernel_thread_helper() for sh32.
This can use the same implementation as sh64, the generated assembly is
the same between the new and old version, so there is not much point in
leaving it open coded in inline assembly.
This is preparatory work for future consolidation of the _32/_64
variants.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7b80fb32b39a51ce3e1afa051f5a616eb8ecbed3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:19:30 2008 +0900
sh: Kill off mv_heartbeat() from the machvec.
Nothing is using this any more, so get rid of it before anyone gets the
bright idea to start using it again.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b94ea27570e4ae87942e2f2ae386d4007ef7ac58
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:17:20 2008 +0900
sh: Kill off the cayman and microdev special heartbeat code.
These can use the generic code instead.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ca0c14e447a399eb90a1c9a4357560c2a29ef499
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 11:47:59 2008 +0900
sh: Kill off sh_bios_in_gdb_mode().
With the reworked kgdb support, we always detach and reinitialize the
stub. This was mostly a feature for handoffs between sh-ipl+g and the
kgdb stub, but virtually no sh-ipl+g versions ever had this working
right in the first place.
Given that the sh-ipl+g stubs in general use today don't even support
the GDB stub, and we have already killed off the special casing in the
sh-sci serial driver, kill off this now unused symbol too.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a9df1ed92fc46cb7c9a9c6b74dbd8bbdc41f69ce
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 11:39:33 2008 +0900
sh: export sh_bios_get_node_addr() symbol for stnic module.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8e32018b0428038b492dad5b19e80bf7d6dc002d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 11:37:51 2008 +0900
sh: Run sh_bios through a long overdue Lindent.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d5701647f1aaaea5da20023976d86af79ab84707
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 20:07:27 2008 +0900
serial: sh-sci: Generalize port pin initialization.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d830fa4584a4015989b9b396a80779f28f277baa
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 19:29:38 2008 +0900
serial: sh-sci: Tidy up fifo overrun error handling.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 762c69e3cad67a5cc5a01ba74e0b552ae4615258
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 18:55:26 2008 +0900
serial: sh-sci: pr_debug() -> dev_dbg() conversion.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 027e68724935599417faa7dd4123c117d18e2483
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 18:36:16 2008 +0900
serial: sh-sci: Fix up the cpufreq notifier to use the proper port clock.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d9341b51f28a5eb4ce231f4a3bbfa02aaecae626
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 09:36:25 2008 +0900
sh: oprofile: Convert op_model_sh7750 to new common interface.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 40a8b421b6a85f7786bf3007d316cd799efe8ea1
Author: Dave Peverley <dpeverley@xxxxxxxxxxxxxx>
Date: Tue Dec 16 09:35:40 2008 +0900
sh: oprofile: Backtrace support.
This patch improves the oprofile support on sh and adds backtrace
support.
Signed-off-by: Dave Peverley <dpeverley@xxxxxxxxxxxxxx>
Signed-off-by: Chris Smith <chris.smith@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 60a51fbe5dd2baef0f35bcf79f25ac1ee239a660
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 09:33:53 2008 +0900
sh: oprofile: Refactor common setup code for multiple driver support.
This re-implements the old op_model_null code in to something more
generic, where multiple drivers, backtrace, etc. can all be interfaced.
Based largely on arch/mips/oprofile/common.c.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 70fe224743c11b57f9b63326313988fdcceb54df
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Tue Dec 16 09:13:05 2008 +0900
sh: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH machines
After the recent changes to switch SuperH board support over to irq_chip
it is now possible to set GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH
boards.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1a94757fae2ac2a9971694b55972f65a396a2f31
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:27 2008 +0000
sh: Convert Cayman boards from hw_interrupt_type to irq_chip
I've been unable to even compile-test this change because I don't have
an sh5 toolchain. All uses of hw_interrupt_type for SuperH boards have
now been converted to use irq_chip.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e85a47744bbdfbcc65c94b2af67499f861c6fa42
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:26 2008 +0000
sh: Convert Dreamcast support from hw_interrupt_type to irq_chip
Switch the dreamcast IRQ code over to the irq_chip way of doing things,
so that we can set GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH boards.
Also, whilst I'm here change some things to make checkpatch.pl happy:
- Indent with tabs, not with spaces
- Include <linux/io.h>, not <asm/io.h>
- Fix the multi-line comment style
- Fix some typos in the comments
Tested-by: Adrian McMenamin <adrian@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit bd0a22d21f26864792a0e49c20f5bd25d6c335e4
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:25 2008 +0000
sh: Convert SystemH board support from hw_interrupt_type to irq_chip
... as part of the hw_interrupt_type to irq_chip crusade.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit be729fd8900f0026238539de46d867d232d1e913
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:24 2008 +0000
sh: Convert Microdev boards from hw_interrupt_type to irq_chip
This is part of the SH move to irq_chip.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 180ae2037f5bc33b0597ddbb76d36b08a74a238a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 12 16:53:14 2008 +0900
sh: Provide sdivsi3/udivsi3/udivdi3 for sh64, kill off libgcc linking.
This moves in the necessary libgcc bits and kills off the libgcc linking
for sh64 kernels as well.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 209aa4fdc39eacc145a7f9c32a4b9ffcc68912c6
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 12 16:35:40 2008 +0900
fb: SH-5 uses __raw I/O accessors now also, drop the special casing.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4466b20cfcfa718ff515b9e3886749cc025e2005
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 12 16:34:44 2008 +0900
sh: Add SH-5 optimized memcpy()/memset()/strcpy()/strlen().
Adopted from the uClibc optimized string versions.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 776d6c298aad42c2b8f191fa9ad826075e4d588c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 11 19:15:14 2008 +0900
sh: Kill off remaining CONFIG_SH_KGDB bits.
Now that we use the generic stub, kill off all of the left over
references.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 07d2a1a1cd8d609a4bc320a492670de57ec6bde1
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 11 19:06:43 2008 +0900
serial: sh-sci: Implement CONSOLE_POLL support and kill off old kgdb
console.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ab6e570ba33dbee18c2520d386e0f367a9b573c3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 11 18:46:46 2008 +0900
sh: Generic kgdb stub support.
This migrates from the old bitrotted kgdb stub implementation and moves
to the generic stub. In the process support for SH-2/SH-2A is also added,
which the old stub never provided.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d7b01f78a3ae6a3cc21a16a1a3d377adc2227537
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 20:17:15 2008 +0900
sh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that SH-5 supports it too.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit dd76279b47dce2c0bd7c54997938ec4cb9f16884
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 20:14:15 2008 +0900
sh: Provide linux/regset.h interface for SH-5.
Plugs in general and FPU regsets.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 94e2fb3d3e1f4cb6bad2b13c572c4c99ad734a37
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 19:46:18 2008 +0900
sh: Provide asm/syscall.h for SH-5.
This provides the asm/syscall.h implementation for sh64 parts.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6ac034375fe8b4341137657adf5e6ff0dcb5a99f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 19:26:44 2008 +0900
sh: Handle cases where setup{_rt,}_frame() fail on SH-5 signal delivery.
Presently these cases are not handled properly due to the return value
not being passed back. This needs to be correct to get proper behaviour
out of things like the tracehook signal notifier, amongst others.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f15b2dc02fef0c53aa5ffa3c4617e184f057d402
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 19:18:46 2008 +0900
sh: Fix up syscall_get_nr() comment in syscall_32.h.
Residual copy-and-paste damage, fix it up.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 35724a0aed6e62bdad640e8a1b8498329708226f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 18:17:19 2008 +0900
sh: Fix up the cpu_asid() return value on nommu.
This ought to be unsigned long, rather than defaulting to int.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a99d6fde69dd9c73ac0b4e42a77ed1ebc714e56a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 18:06:36 2008 +0900
sh: Convert sh64 /proc/asids to debugfs and generic sh.
This converts the sh64 /proc/asids entry to debugfs and enables it for
all SH parts that have debugfs enabled.
On MMU systems this can be used to determine which processes are using
which ASIDs which in turn can be used for finer grained cache tag
analysis.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4d1f3bbec49a080cae753aaa44dc1fc7277b3e50
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 17:16:09 2008 +0900
sh: Kill off sh64's unused alloc/free_task_struct() definitions.
These were left over from some time ago, sh64 never got around to
defining __HAVE_ARCH_TASK_STRUCT_ALLOCATOR during the conversion, and it
has no need to. Kill these off and use the generic versions instead.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4eec8834f085e5eaf70e64849f879068256c07c5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 17:09:36 2008 +0900
sh: mach-migor: Kill off unused Migo-R machvec.
This kills off the special Migo-R machvec, as nothing is using it. By
default this will switch to using the generic machvec, which provides the
same functionality. This saves us a bit of space in the machvec section.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4545bfa00a010b619a596b3893be820935c01bb7
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Wed Dec 10 17:02:13 2008 +0900
sh: add ov772x reset delay on Migo-R
Add reset delay for the ov772x device on Migo-R.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a6bc25abc89a72a8533dbb912a4116a8349b9d8c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 13:42:14 2008 +0900
sh: Drop the special qemu defconfig.
QEMU can now use rts7751r2dplus_defconfig directly, there is no more need
for a neutered defconfig.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit bd40e8132336fbc3f2857f24720e11b6c1c9ac26
Author: Aoi Shinkai <shinkoi2005@xxxxxxxxx>
Date: Wed Dec 10 13:30:28 2008 +0900
sh: Delete unnecessary mov in the interrupt exception entry point.
The INTEVT read at interrupt exception entry is uneccessary, as the read
is deferred until we are ready to enter do_IRQ(). The kgdb nmi path still
requires it, so move it there.
Signed-off-by: Aoi Shinkai <shinkoi2005@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 06be3724548a443a99d703ff79f43d6f1e2975f0
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 17:01:40 2008 +0900
sh: Fix an off-by-1 check in __mutex_fastpath_unlock().
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a47925ffd1b1b22ee004de36e2c8b811910616ba
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 14:53:28 2008 +0900
sh: Update rsk701_defconfig to reflect mach-rsk changes.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ff15b9050677b9d63959cbca4c9abe36a05c72c9
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 14:46:55 2008 +0900
sh: Enable leds-gpio in rsk7203 defconfig.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ea0aac1e1327476d2f6a38f08145281237cf1b03
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 14:32:03 2008 +0900
sh: Consolidate rsk7203/7201 in to a new mach-rsk.
RSK+ platforms have quite a few characteristics in common, so roll them
together in to a shiny new RSK mach-type.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b5cfeac990cc164a3d3422aab88ac5b138fa822d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 12:02:28 2008 +0900
sh: Provide ftrace_make_call()/ftrace_make_nop().
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4bc3e7192cf9a47d9864c4e8259859be55a480b3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 11:49:19 2008 +0900
sh: Disable -Werror for arch/sh/oprofile/.
drivers/oprofile/ objects have proven to be problematic in this regard,
so simply disable -Werror for now.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3b041227f7ef7c7e97f205c68c6069c0c62e5204
Author: Takashi YOSHII <yoshii.takashi@xxxxxxxxxxx>
Date: Mon Dec 8 11:33:06 2008 +0900
sh: Add plain udivsi3 (not _i4*) for gcc-4.1 and lower.
We chan't share code for udivsi3 and udivsi3_i4, because they
have a different clobber list. Copy udivsi3 from gcc-4.1.2.
As shown in arch/sh/lib/udivsi3.S (and -Os.S),
.global __udivsi3_i4i
.global __udivsi3_i4
.global __udivsi3
__udivsi3_i4i:
...
Three symbols are sharing one code, which is actually udivsi3_i4i.
But, this results unwanted code with gcc 4.1.
In gcc, these three are treated as pseudo instructions that have
their own clobber list apart from the usual calling convention.
According to sh's machine description. The clobber list is as
follows:
- udivsi3_i4i : t,r1,pr,mach,macl
- udivsi3_i4 : t,r0,r1,r4,r5,pr,dr0,dr2,dr4
- udivsi3 : t,r4,pr
The caller of udivsi3 will be left with a broken r1 and mac*.
gcc-4.1.x and older(at least to 3.4) generate udivsi3.
ST's gcc-4.1.1 seems to be OK because it has _i4i.
Signed-off-by: Takashi YOSHII <yoshii.takashi@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1fdae0e59a3fc9e391d2422ddcfbdbdec1e8f724
Author: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Date: Fri Dec 5 14:07:57 2008 +1100
Fix incorrect use of loose in c-checksum.c
Fix incorrect use of loose in c-checksum.c
It should be 'lose', not 'loose'.
Signed-off-by: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 77ba93a7ac5fb0d9338bffbf97c787b8efe00806
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 11:25:50 2008 +0900
sh: Fix up the SH-4A mutex fastpath semantics.
This fixes up the __mutex_fastpath_xxx() routines to match the semantics
noted in the comment. Previously these were looping rather than doing a
single-pass, which is counter-intuitive, as the slow path takes care of
the looping for us in the event of contention.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c6f17cb2272121475c87592560534b157b17544e
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 22:45:20 2008 +0900
sh: allow CONFIG_CPU_IDLE
Allow users to select CONFIG_CPU_IDLE regardless of processor type or board.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit af998a9a0ae3291e86ddcae8e196a1cbf82c2457
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 22:45:12 2008 +0900
sh: allow CONFIG_PM
Allow users to select CONFIG_PM regardless of processor type or board.
Suspend and hibernation are only allowed on supported platforms.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3e51762759db9e26c6c3e4e1010d80a50c62ca03
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 22:45:03 2008 +0900
sh: move the hp6xx pm code
Move the not-so-generic pm code from arch/sh/kernel/pm.c to the
platform directory together with the rest of the hp6xx pm code.
This is done to let non-hp6xx platforms enable CONFIG_PM.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 04645185d06e8b0c92f6f1f9d76ede45637afc09
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:39 2008 +0900
sh: update se7343 defconfig
Update the se7343 defconfig with:
- use 33MHz PCLK
- increase max number of SCIFs
- add serial console configuration to compiled-in kernel command line
- add 8250 serial port support
- add sh-mobile-i2c driver
- add uio driver to export VEU and VPU
- add usb support and isp1161 host controller
- add dm9601 ethernet-over-usb support
- remove smc91x support
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 21c601bb2ec79be5c52a99bc6f4b513aff4fa236
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:30 2008 +0900
sh: remove ioport cruft and smc91x from se7343
Remove out-of-date se7343 ioport code including some old support
for unknown-ne2000-pcmcia-card, cf-over-pcmcia and a mysterical
smc91x that once must have been on a special daughterboard.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5e5aacb0de70fa80e8b1a2b803ae9e2ad40b8e52
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:22 2008 +0900
sh: add isp1161 usb host device to se7343
Add isp1161 platform data to get usb host working on se7343.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6aacba72dbdadc1445244e366ecf0263a160409e
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:11 2008 +0900
sh: add st16c2550 devices to se7343
Add 8250 platform data to setup the ST16C2550C chip on se7343.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5727003b5d23eb852c057d25459bba27cbf754c3
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:02 2008 +0900
sh: fix number of interrupts on se7343
Fix to make sure that the on-board interrupt sources are included
in the interrupt count on se7343.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 551ea2b40ecf75e0035406fe75ba995233737e76
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 17:59:54 2008 +0900
sh: sh7343 scif configuration update
Fix interrupt values for the first sh7343 SCIF port and
update the configuration to include the remaining 3 ones.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0c0daec7ca4f6a67daeafc4343bb453a4a246dbd
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Mon Dec 1 15:40:33 2008 +0900
sh: propagate r_clk
Make sure the 32 KHz r_clk rate gets propagated correctly. Without
this fix the clocks for RTC, CMT, KEYSC and RWDT are stuck at 0 Hz.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6feb348783767e3f38d7612e6551ee8b580ac4e9
Author: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Date: Fri Nov 28 22:56:45 2008 +0900
sh: RSK+ 7201 board support.
This patch adds support for the RTE RSK+ 7201 board.
Signed-off-by: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2825999e8a9bd7ab7e25a7e7475c7cdd10371a13
Author: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Date: Fri Nov 28 22:48:20 2008 +0900
sh: Add support for SH7201 CPU subtype.
This patch adds support for the SH-2A FPU based SH7201 processor subtype.
Signed-off-by: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 135210b378d26f9a9a0c901d0089522c06b5807a
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Fri Nov 28 08:58:30 2008 +0000
sh: Switch HD64461 from hw_interrupt_type to irq_chip
Use struct irq_chip for the interrupt handler for the HD64461. Also
convert some in{b,w} and out{b,w} calls to the equivalent __raw_* calls.
Include <linux/io.h> and not <asm/io.h> to stop checkpatch.pl
complaining.
This change should now allow machines with HD64461 to define
GENERIC_HARDIRQS_NO__DO_IRQ.
Acked-by: Kristoffer Ericson <Kristoffer.Ericson@xxxxxxxxx>
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 331ff103c7737294c8ecd7921564dae07b9e4632
Author: Yoshihiro Shimoda <shimoda.yoshihiro@xxxxxxxxxxx>
Date: Thu Nov 27 18:57:35 2008 +0900
sh: pci-sh7780: fix pci memory address mask
Fix the problem that cannot work a PCI device when system memory size is
256Mbyte in 29bit address mode.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 22f131aa8de7a534339bf7051680234462f2e877
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 27 11:04:43 2008 +0900
sh: Provide a dyn_arch_ftrace struct definition.
Needed for dynamic ftrace API changes.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1da1180c6e28cf21be356e2701978727558fa198
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:52:44 2008 +0900
sh: Split out the idle loop for reuse between _32/_64 variants.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit eb67cf14ae5c21609c200859d6f3eba71c591569
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:47:44 2008 +0900
sh: Consolidate cpu_relax()/cpu_sleep() definitions across _32/_64.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f74c034d52d0f908d5b929423a680962a2586199
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:22:50 2008 +0900
sh: do not latency trace idle.
Description snipped from Steven Rostedt's PPC patch:
When idle is called, interrupts are blocked, but the idle
function will still wake up on an interrupt. The problem is
that the interrupt disabled latency tracer will take this call
to idle as a latency.
This patch disables the latency tracing when going into idle.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 75fd24c1073adcd1e8ea43048d946bbfa34dfc64
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:20:35 2008 +0900
sh: Tidy up backtrace formatting with kallsyms disabled.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9cfc9a9b6fff9ea7a19814b4472b3cb18b7bbdcc
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 14:31:03 2008 +0900
sh: Add a simple code dumper for SUPERH32 show_regs().
This implements a simple show_code() that is in turn plugged in to
show_regs() to provide minimal code dumping at the end of the trace.
Built on top of a simple instruction disassembler derived from the
binutils opcode table.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit edfd6da0405520b147ab1473ad183a5b32be7082
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 13:06:04 2008 +0900
sh: Add a few more branch types to the branch emulator.
This plugs in some extra encodings for matching more bsr/bsrf/jsr
branches.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5dd614761f05f56b93c94541aa92e6449920516c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 04:21:36 2008 +0900
sh: Re-add support for best fit ISA tuning if none is available.
This was removed in the libgcc integration, but there are still some
compilers that need this. We also relax the rules on the ISA tuning in
the cases where there are no matches for the CPU tuning and adopt the
-any default, which matches the intent of the isa-y target list. This
compensates for mismatches where binutils supports a wide array of
targets whilst the compiler is much more restricted.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 624c6a6750c502981d92de4579647fe2549451dd
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 03:44:07 2008 +0900
sh: More movmem alias symbol exports for older compilers.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 95b781c239f53b4c7ecaf2989404ec6379b2409b
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 00:29:58 2008 +0900
sh: Provide optimized unaligned loads on SH-4A.
This adds support for unaligned loads on SH-4A, using the SH-4A's
neutered movua.l instruction. As movua.l is r0-inspired, stores are
still handled through the packed struct.
Based on asm-generic/unaligned.h by Harvey Harrison.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 716777db7270255f1f7210fd87a7188b08c9a267
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Tue Nov 25 21:57:29 2008 +0900
sh: P4 ioremap pass-through
This patch adds a pass-through case when ioremapping P4 addresses.
Addresses passed to ioremap() should be physical addresses, so the
best option is usually to convert the virtual address to a physical
address before calling ioremap. This will give you a virtual address
in P2 which matches the physical address and this works well for
most internal hardware blocks on the SuperH architecture.
However, some hardware blocks must be accessed through P4. Converting
the P4 address to a physical and then back to a P2 does not work. One
example of this is the sh7722 TMU block, it must be accessed through P4.
Without this patch P4 addresses will be mapped using PTEs which
requires the page allocator to be up and running.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0c9122323acb0c3410dfbd219cb47f4c2e9305e3
Author: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Date: Tue Nov 25 21:37:14 2008 +0900
sh: Add SH-4A optimized fastpath mutex implementation.
Add fast mutex path implementation for the SH4A architecture
Signed-off-by: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5c72f303a2b7862dbba79f4176ddc922a440b567
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Date: Fri Nov 21 14:35:29 2008 +0900
sh: sh7760fb: Add support SH7720/SH7721 of Renesas
SH7720 and 7721 has IP of Frame Buffer same as SH7760.
This driver can support these.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 679dc3c92ca7894c3df70ee3333ff9878e7d90b9
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Date: Fri Nov 21 14:34:25 2008 +0900
sh: sh7760fb: Fix color pallette setting
The setting of the color palette was wrong, fixed it.
And removed fb_setcmap, and added fb_setcolreg function.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f617682e9cabd5616dc2fe53c67762790eeb14d3
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Sun Nov 23 15:00:31 2008 +0000
sh: add SH DMAC burst mode constant
The SH7709 datasheet defines bit 5 as set for burst mode, clear for
cycle-steal mode.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c2c5883b3fce61388eb02ca328072400eb54769c
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Sun Nov 23 14:27:22 2008 +0000
sh: fix DMAOR register access on SH7709
sh7709 hardware manual says DMAOR is 16 bits long on this platform.
Tested and working with a modified smsc911x ethernet driver (sh-dma
support patch for this driver is coming soon).
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8085ac753164f45fd23603e7cad85a4c985cbf75
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Sun Nov 23 14:27:21 2008 +0000
sh: Add platform-specific constants for SH7709
I'm using these constants in support of an in-house development board,
and thought they may be useful to other users of SH7709.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0d5bbe0bc2583c4dc06ea00adccf07c3acd1481d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 25 21:22:02 2008 +0900
sh: Provide optimized non-atomic bitops for SH-2A.
This ties in the new SH-2A 32-bit non-atomic bitops.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8bcc5c1c332af97ba731f99fda780a47911e476f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 20 15:28:47 2008 +0900
sh: Add -m4al tuning for SH4AL-DSP.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9ef100287afa8e134de50258b8382cbc9d20f954
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 20 15:26:35 2008 +0900
sh: Add exports for __udivsi3/__sdivsi3 and the _i4 versions.
Needed by older compilers.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 16b529d1d78060254d5bc735390915ca5ccf13a1
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 20 15:25:22 2008 +0900
sh: Convert to generic bitops for IRQ-toggling implementation.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 709420dd4e75083ee7920e61c2d0bcc3db9b7405
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 17:35:45 2008 +0900
sh: Specify sane default image targets for the SH-2 platforms.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1aad54a99b6ce316c851ba99b2efe41998cfd37d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 17:33:48 2008 +0900
sh: Migrate necessary libgcc bits in to arch/sh/lib for SUPERH32.
This moves in the necessary libgcc bits for SUPERH32 and drops the
libgcc linking for the regular targets. This in turn allows us to rip
out quite a few hacks both in sh_ksyms_32 and arch/sh/Makefile.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e9bf51e5ccc7703226c79888603e157066213700
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 14:22:39 2008 +0900
sh: __udivdi3 -> do_div() in softfloat lib.
Inhibit the generation of __udivdi3 for the softfloat lib, use do_div()
outright.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 00e825c6b99b39f12751ea45d38bb4d900de70f4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 14:21:34 2008 +0900
sh: Fix clock framework compiler warnings.
CC arch/sh/kernel/cpu/clock.o
arch/sh/kernel/cpu/clock.c: In function 'clk_disable':
arch/sh/kernel/cpu/clock.c:156: warning: 'return' with a value, in
function returning void
Introduced by ("sh: enable and disable clocks recursively").
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d6435102d4ca3b5655c0105abe924abec17ffeb8
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 12:40:39 2008 +0900
usb: Fix up sh_mobile usbf clock framework warnings.
drivers/usb/gadget/m66592-udc.c: In function 'm66592_probe':
drivers/usb/gadget/m66592-udc.c:1672: warning: label 'clean_up2' defined
but not used
drivers/usb/host/r8a66597-hcd.c: In function 'r8a66597_probe':
drivers/usb/host/r8a66597-hcd.c:2401: warning: label 'clean_up2' defined
but not used
Added by commit 985fc7c81c7852f2e104c71cbe913ace683c9e6a ("sh: sh_mobile
usbf clock framework support").
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e7c98dc76d5823444059205e0c7aca49743679f3
Author: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Date: Thu Nov 13 18:18:35 2008 +0900
serial: sh-sci: Codestyle cleanup patch.
Trivial coding style cleanups.
Signed-off-by: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit af505b1eab55445e832bebbe5686f5bd22f1b717
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 13 12:20:26 2008 +0900
media: sh_mobile_ceu_camera: Add HAVE_CLK dependency.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit fad57feba77d2e5b183e068cb6b90693e4567b40
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Wed Nov 12 20:11:47 2008 +0900
sh: dynamic ftrace support.
First cut at dynamic ftrace support.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ef6aff6884408db95ceb0f678f583536e0bd48f8
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:24:01 2008 +0900
sh: remove old sh_mobile mstpc clocks
Remove the old sh_mobile mstpcr clocks.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b51339fff240ff179730f8963a758147fd60f3ec
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:23:26 2008 +0900
sh: sh_mobile lcdc clock framework support
Add clock framework support to the lcdc driver and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 765786e0aead7faf6c333176d22948c6f155fff1
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:22:38 2008 +0900
sh: sh_mobile usb clock framework support
Add clock framework support to the usb/r8a66597 driver and
adjust the cpu specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit af5be79a7f8d7067588dc2863d37f7cd22e5f2de
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:22:13 2008 +0900
sh: sh_mobile usbf clock framework support
Add clock framework support to the usbf/m66592 driver and
adjust the cpu specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a42b6dd69cb1c61c5f5a24061a227c22071786de
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:21:44 2008 +0900
sh: sh_mobile ceu clock framework support
Add clock framework support to the sh_mobile ceu and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 090d951b69f29a8d5777c63570d4cd61d7efeb22
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:21:23 2008 +0900
sh: sh_mobile keysc clock framework support
Add clock framework support to the sh_mobile keysc driver and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a5616bd0f19730a780c354110454ce37209f1ded
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:20:55 2008 +0900
sh: sh_mobile i2c clock framework support
Add clock framework support to the sh_mobile i2c driver and
adjust the processor specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f2eb0109fb4268505b0737cfe661542eb6151907
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:20:23 2008 +0900
sh: sh_mobile mstpcr clocks for sh7366
Add sh7366 mstpcr bits and information about their parent clocks.
The datasheet is pretty clear about the clocks on this device.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6e88d030a1491ec0f130dc4765d06b22f7db6610
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:19:38 2008 +0900
sh: sh_mobile mstpcr clocks for sh7343
Add sh7343 mstpcr bits and information about their parent clocks.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f14c017d6b2e9e97b0d5f0b33f573797dde4d4f1
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:16:08 2008 +0900
sh: sh_mobile mstpcr clocks for sh7723
Add sh7723 mstpcr bits and information about their parent clocks.
The datasheet is pretty clear about the clocks on this device.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ecf399bdafb83b6c0091837dd2a0612470e9c8d2
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:15:48 2008 +0900
sh: sh_mobile mstpcr clocks for sh7722
Add sh7722 mstpcr bits and information about their parent clocks.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7c7e02a28b4e7212dcdcc24bbd2b137790504a84
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:15:07 2008 +0900
sh: new sh_mobile mstpcr clocks base code
Add base code to handle new mstpcr clocks. Make sure clock rates propagate.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1dc7b776d91ac9f016982e418e74cb14f63c5b02
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:14:28 2008 +0900
sh: use arch_flags for sh_mobile mstpcr clock bits
Use arch_flags to keep track of register and flag number.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d902d04f5410176bdec77bfefa032516326eb542
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:14:03 2008 +0900
sh: sh_mobile clock divider index fix
Use divider index value instead of divider value.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d12cfac146d2b512496bf974b83ee1210032065f
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:13:32 2008 +0900
sh: enable and disable clocks recursively
Recurse and make sure parent clocks get enabled/disabled.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4a4a9be3ebdbf17957d29e3521f328a1145f9431
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 12 13:17:38 2008 +0900
sh: Move arch_get_unmapped_area() in to arch/sh/mm/mmap.c.
Now that arch/sh/mm/mmap.c exists, move arch_get_unmapped_area() there.
Follows the ARM change.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ed2b03ed3cec2a4719d04ef208319f9de6a4258a
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 17 13:28:39 2008 -0800
MIPS: MIPS64R2: Fix buggy __arch_swab64
The way the code is written it was assuming dshd has the function of a
hypothetical dshw instruction ...
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 08d9d1c4d44ce43856da048cb0737ef769b61e9a
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 17 18:19:18 2008 -0800
MIPS: Fix preprocessor warnings flaged by GCC 4.4
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 826e08b0157c0ce8a80dfe3c0a6c5a1540dd0b1d
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Dec 22 07:37:41 2008 +0100
sched: fix warning in fs/proc/base.c
Stephen Rothwell reported this new (harmless) build warning on platforms
that
define u64 to long:
fs/proc/base.c: In function 'proc_pid_schedstat':
fs/proc/base.c:352: warning: format '%llu' expects type 'long long
unsigned int', but argument 3 has type 'u64'
asm-generic/int-l64.h platforms strike again: that file should be
eliminated.
Fix it by casting the parameters to long long.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d3d317092b58a6df1d31a4ca90cdb9d2bd4ebffa
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:21:52 2008 -0800
tg3: Update version to 3.97
This patch updates the version number to 3.97.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa10f27d99410cff9145bf91b6efc884c7a4871c
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:21:18 2008 -0800
tg3: tg3.h cleanups
This patch cleans up the tg3 header file by removing the preprocessor
definitions for standard PCI configuration space registers. The driver
should be using the standard definitions when needed. The patch
continues by removing redundant PHY related definitions and reorganizes
some of the remaining entries.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 69fc405318967c7913e5b55cf3906250a26b49d0
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:19:57 2008 -0800
tg3: Remove unused cfgspc device members
This patch removes the pci_bist and pci_hdr_type members from the
device structure and removes the code that references them. They are
not really used.
The patch rounds out the changes by moving the pci_cmd member to plug
a structure hole that would have been created. On 32-bit systems, this
movement removes a subsequent structure hole later in the structure. On
64-bit systems though, the movement merely consolidates two holes into
one larger hole.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 027455adacdc142cc018e555ce391014fa227e70
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:19:30 2008 -0800
tg3: Cleanup IPV6 LSO
This patch attempts to make the relationship between IPV6 checksum
offload and IPV6 LSO more obvious. The patch also toggles a bit
needed for IPV6 LSO on 5785 and 57780 devices.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2023276ebf074a01eb56f38ed4d04deef1deee67
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:18:56 2008 -0800
tg3: WOL fixes
The first hunk of this patch inverts a flag that was accidentally
toggled as part of commit 0a459aac9d151c2e36ec65723b9b845b24c5cbc3
("tg3: Allow WOL for phylib controlled Broadcom phys").
The second hunk of the patch removes the call to
device_may_wakeup() in the 5906 config detection path. At the
point of the call, the driver shouldn't be querying for WOL
capability. It should be detecting and setting it.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7f3ff4f63f76c2702da6041d2da5eb30fac407f6
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Sun Dec 21 20:14:48 2008 -0800
pkt_sched: Annotate uninitialized var in sfq_enqueue()
Some gcc versions warn that ret may be used uninitialized in
sfq_enqueue(). It's a false positive, so let's annotate this.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bfb8cc31b11ccaf7cd55fd9e0f4794f82527948f
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Dec 21 20:11:04 2008 -0800
ixgbe: fix the display of DCB control stats in ethtool
Priority flow contol statistics for Data Center Bridging (DCB) weren't
included in ethtool. This patch adds them.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4314e815e87b4ab1c9b1115dd5853cd20ca999c
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Dec 21 20:10:29 2008 -0800
net: add DCNA attribute to the BCN interface for DCB
Adds the Backward Congestion Notification Address (BCNA) attribute to the
Backward Congestion Notification (BCN) interface for Data Center Bridging
(DCB), which was missing. Receive the BCNA attribute in the ixgbe driver.
The BCNA attribute is for a switch to inform the endstation about the
physical
port identification in order to support BCN on aggregated links.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 1486a61ebcd2711532f8163d30babc40e11e7b40
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Dec 21 20:09:50 2008 -0800
net: fix DCB setstate to return success/failure
Data Center Bridging (DCB) had no way to know if setstate had failed in the
driver. This patch enables dcb netlink code to handle the status for the
DCB
setstate interface. Likewise it allows the driver to return a failed status
if MSI-X isn't enabled.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c2da953a46b18b7515ad476c1c1686640a12e93a
Merge: c94cb314503a69492bf4455dce4f6d300cff0851
9cf7f247bd0cd21e475c71a4e018bb612ef02aab
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 21 19:57:10 2008 -0800
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 59f8500efb05096484a55263109acab6a6df89d5
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Mon Dec 22 02:00:17 2008 +0100
Convert ixp4xx_eth driver to use net_device_ops.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 4cb56b685617732733d4d9dffbf8c5a81d4a0c71
Author: Julia Lawall <julia@xxxxxxx>
Date: Sun Dec 21 16:39:15 2008 +0100
drivers/net/wan: Remove redundant test
arg is checked not to be NULL a few lines before.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 93bc933524d05e3b391358e24b3666599f8ec026
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Wed Nov 26 23:06:57 2008 +0100
HDLC_PPP: Fix Configure-Ack to return original options as required by the
standard.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit e6da96ace859dad966fe85cc9552b89f48bbc930
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Mon Dec 22 00:26:38 2008 +0100
IXP4xx: move common debugging from network drivers to QMGR module.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 9251ce959cab704eb0e4910860b06b18e7083474
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sun Dec 21 23:52:36 2008 +0100
Update MAINTAINERS entries for IXP4xx and WAN network drivers.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit f5b89e41ce7a980aa2fd8ad105626b9ed4e8d347
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sun Dec 21 23:52:18 2008 +0100
WAN: Add IXP4xx HSS HDLC driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 490b77224fe66c77ab7cb48d6b77e62cb55591a0
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sun Dec 21 00:02:34 2008 +0100
IXP4xx: Add ethtool support to Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 4954936e25cb8ce99a96cac9dd9417d7b639867a
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sat Dec 20 18:57:23 2008 +0100
IXP4xx: Add PHYLIB MII ioctl to the Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 2098c18d6cf65358dd1620154bdedbc8c8d36f44
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sat Dec 20 01:53:08 2008 +0100
IXP4xx: Add PHYLIB support to Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit b4c7d3b07257528d3c0bfd07c5b38b48beb9b6d1
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sat Dec 20 01:58:59 2008 +0100
IXP4xx: Make the Ethernet driver use built-in netdev stats.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 3c36a837a960ccbff05fa773a495c389fbd42f0e
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Wed Nov 26 22:59:18 2008 +0100
IXP4xx: Silence section mismatch warning in Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit ae2754a975694a3865788e303b741d0f616bc43a
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Fri May 9 02:14:09 2008 +0200
IXP4xx: clear IRQ stat in qmgr_disable_irq().
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 3edcfb2937054fb546ecf3a8883675751db16c6f
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Thu May 8 23:18:31 2008 +0200
IXP4xx: check for queue being empty in qmgr_release_queue().
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit bba7ebba3b17f4fe8c5907a32e16d9bd3fcf5192
Author: David Disseldorp <ddiss@xxxxxxx>
Date: Sun Dec 21 13:56:50 2008 -0800
IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
iSCSI/iSER targets may send PDUs without a prior request from the
initiator. RFC 5046 refers to these PDUs as "unexpected". NOP-In PDUs
with itt=RESERVED and Asynchronous Message PDUs occupy this category.
The amount of active "unexpected" PDU's an iSER target may have at any
time is governed by the MaxOutstandingUnexpectedPDUs key, which is not
yet supported.
Currently when an iSER target sends an "unexpected" PDU, the
initiators recv buffer consumed by the PDU is not replaced. If over
initial_post_recv_bufs_num "unexpected" PDUs are received then the
receive queue will run out of receive work requests entirely.
This patch ensures recv buffers consumed by "unexpected" PDUs are
replaced in the next iser_post_receive_control() call.
Signed-off-by: David Disseldorp <ddiss@xxxxxxx>
Signed-off-by: Ken Sandars <ksandars@xxxxxxx>
Acked-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 139cdab0a2af6f5eaee47cc0144608e53b65279d
Author: Julia Lawall <julia@xxxxxxx>
Date: Sun Dec 21 13:29:13 2008 -0800
IB/ehca: Remove redundant test of vpage
vpage is checked not to be NULL just after it is initialized at the
beginning of each loop iteration.
A simplified version of the semantic patch that makes this change is
as follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 418441d9ebe84b205cb23eb0ab214c1f991621fe
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:32 2008 -0700
powerpc/mpc5200: fix error paths in PSC UART probe function
- error cases for mapbase and irq were unbundled
- mapped irq now gets disposed on error
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit aec739e010f8163eac225f4e331ac7fbd59ac5c8
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:32 2008 -0700
powerpc/mpc5200: add rts/cts handling in PSC UART driver
Add RTS/CTS-support for the PSC of the MPC5200B. Tested with a Phytec
MPC5200B-IO.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit b65149880d0467287fa4c7b4f19953392323f4ac
Author: René Bürgel <r.buergel@xxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:31 2008 -0700
powerpc/mpc5200: Make PSC UART driver update serial errors counters
This patch adds the capability to the mpc52xx-uart to report framing
errors, parity errors, breaks and overruns to userspace. These values
may be requested in userspace by using the ioctl TIOCGICOUNT.
Signed-off-by: René Bürgel <r.buergel@xxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit e51f47a5c695b76905aadc2be47c7dc774f3e5af
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:30 2008 -0700
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
As this driver polls for a complete MDIO transaction, there is no need
to enable interrupts for it. Furthermore, make both checks for
freeing MDIO-bus irqs consistent.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 6b61e69e7bc1cfe80ab54c6321f19061f9487ed3
Author: Tim Yamin <plasm@xxxxxxxxx>
Date: Sun Dec 21 02:54:29 2008 -0700
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
This patch adds MDMA/UDMA support using BestComm for DMA on the MPC5200
platform. Based heavily on previous work by Freescale (Bernard Kuhn,
John Rigby) and Domen Puncer.
With this patch, a SanDisk Extreme IV CF card gets read speeds of
approximately 26.70 MB/sec.
Signed-off-by: Tim Yamin <plasm@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit aaab5e83c2c25d94f7409bdc947a5cc383514e15
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:28 2008 -0700
powerpc/mpc5200: Disable bestcomm prefetching when ATA DMA enabled
When ATA DMA is enabled, bestcomm prefetching does not work. This
patch adds a function to disable bestcomm prefetch when the ATA
Bestcomm task is initialized.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit e4efe3c271c5498ffe7e167eaff01514be2b9a77
Author: Tim Yamin <plasm@xxxxxxxxx>
Date: Sun Dec 21 02:54:28 2008 -0700
powerpc/mpc5200: Bestcomm fixes to ATA support
1) ata.h has dst_pa in the wrong place (needs to match what the BestComm
task microcode in bcom_ata_task.c expects); fix it.
2) The BestComm ATA task priority was changed to maximum in bestcomm_priv.h;
this fixes a deadlock issue experienced with heavy DMA occurring on
both the ATA and Ethernet BestComm tasks, e.g. when downloading a large
file over a LAN to disk.
Signed-off-by: Tim Yamin <plasm@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 622882455aa718cfbd6785cc5fbc479f1d976095
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:27 2008 -0700
powerpc/mpc5200: Bugfix on handling variable sized buffer descriptors
The buffer descriptors for the ATA BestComm task are larger than the
current definition for bcom_bd. This causes problems because the
various bcom_... functions dereference the buffer descriptor pointer
by using the array operator which doesn't work when the buffer
descriptors are a different size.
This patch adds the bcom_get_bd() function which uses the value in
bcom_task.bd_size to calculate the offset into the BD table. This
patch also changes the definition of bcom_bd to specify a data size
of 0 instead of 1 so that it will never work if anyone attempts to
dereference the bd list as an array (as opposed to something that
might work even though it is wrong).
Finally, this patch moves the definition of bcom_bd up in the file
to eliminate a forward declaration.
Based on patch originally written by Tim Yamin.
Signed-off-by: Tim Yamin <plasm@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit dd952cbb3dae9ea2dc47cc902b796e1e2bf806f0
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:27 2008 -0700
powerpc/mpc5200: Make internal 5200 PIC the default interrupt controller
The MPC5200 internal interrupt controller setup function needs to set
the default interrupt controller when it is called. Without this
irq_create_of_mapping() cannot be called without first determining
the pointer to the irq controller (ie. call with controller = NULL).
Reported-by: Steven Cavanagh <scavanagh@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit bcb73f5611c1946db768a1c219d205b3bf90f4a5
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:26 2008 -0700
powerpc/mpc5200: Document and tidy irq driver
This patch adds documentation to the mpc5200 interrupt controller
driver and cleans up some minor coding conventions. It also moves the
contents of mpc52xx_pic.h into the driver proper (except for a small
common bit that is moved to the common mpc52xx.h) because the
information encoded there is not required by any other part of kernel
code. Finally for code readability sake, the L2_OFFSET shift value
is removed because the code using it resolves to a noop.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit a14953597b771f793ce32529d7b8b04fdedca3ef
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:25 2008 -0700
powerpc: Fix missing 'blr' in _tlbia()
Rework to MMU code dropped a much missed 'blr' instruction.
Brown-Paper-Bag-Worn-By: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 3ddeb912f41801fd1968c7880d031702a396e4d0
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Date: Sat Dec 20 17:15:14 2008 +0800
ftrace: enable format arguments checking
Impact: broaden gcc printf format checks for ftrace_printk()
format arguments checking for ftrace_printk() is __printf(1, 2),
not __printf(1, 0).
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 49e6e3f1aec2d46f5865d3ada38fe9a5d660ef5d
Author: Scott Wood <scottwood@xxxxxxxxxxxxx>
Date: Fri Dec 19 10:13:09 2008 +0000
powerpc/bootwrapper: Use the child-bus #address-cells to decide which range
entry to use
The correct #address-cells was still used for the actual translation,
so the impact is only a possibility of choosing the wrong range entry
or failing to find any match. Most common cases were not affected.
Signed-off-by: Scott Wood <scottwood@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit e14d77490d3e1da833cff4fee52674c52684ce77
Author: Grant Erickson <gerickson@xxxxxxxxxxxxxx>
Date: Fri Dec 19 08:17:54 2008 +0000
powerpc: Const-qualify Device Node Argument to DCR Resource Extent API
Add const qualifier to device_node argument for
dcr_resource_{start,len} as of_get_property also const-qualifies this
argument.
Signed-off-by: Grant Erickson <gerickson@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 9dce3ce5c55c848f00429005a46fd6246cfabfbe
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:54 2008 +0000
powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
After discussing with chip designers, it appears that it's not
necessary to set G everywhere on 440 cores. The various core
errata related to prefetch should be sorted out by firmware by
disabling icache prefetching in CCR0. We add the workaround to
the kernel however just in case oooold firmwares don't do it.
This is valid for -all- 4xx core variants. Later ones hard wire
the absence of prefetch but it doesn't harm to clear the bits
in CCR0 (they should already be cleared anyway).
We still leave G=1 on the linear mapping for now, we need to
stop over-mapping RAM to be able to remove it.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 64b3d0e8122b422e879b23d42f9e0e8efbbf9744
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:51 2008 +0000
powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
Currently, we never set _PAGE_COHERENT in the PTEs, we just OR it in
in the hash code based on some CPU feature bit. We also manipulate
_PAGE_NO_CACHE and _PAGE_GUARDED by hand in all sorts of places.
This changes the logic so that instead, the PTE now contains
_PAGE_COHERENT for all normal RAM pages thay have I = 0 on platforms
that need it. The hash code clears it if the feature bit is not set.
It also adds some clean accessors to setup various valid combinations
of access flags and change various bits of code to use them instead.
This should help having the PTE actually containing the bit
combinations that we really want.
I also removed _PAGE_GUARDED from _PAGE_BASE on 44x and instead
set it explicitely from the TLB miss. I will ultimately remove it
completely as it appears that it might not be needed after all
but in the meantime, having it in the TLB miss makes things a
lot easier.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 77520351805cc19ba37394ae33f862ef6d3c2a23
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:48 2008 +0000
powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
This makes the MMU context code used for CPUs with no hash table
(except 603) dynamically allocate the various maps used to track
the state of contexts.
Only the main free map and CPU 0 stale map are allocated at boot
time. Other CPU maps are allocated when those CPUs are brought up
and freed if they are unplugged.
This also moves the initialization of the MMU context management
slightly later during the boot process, which should be fine as
it's really only needed when userland if first started anyways.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 760ec0e02d8a13d0ed60d99f47879d4aa8ef1910
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:46 2008 +0000
powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
The handlers for Critical, Machine Check or Debug interrupts
will save and restore MMUCR nowadays, thus we only need to
disable normal interrupts when invalidating TLB entries.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2a4aca1144394653269720ffbb5a325a77abd5fa
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:42 2008 +0000
powerpc/mm: Split low level tlb invalidate for nohash processors
Currently, the various forms of low level TLB invalidations are all
implemented in misc_32.S for 32-bit processors, in a fairly scary
mess of #ifdef's and with interesting duplication such as a whole
bunch of code for FSL _tlbie and _tlbia which are no longer used.
This moves things around such that _tlbie is now defined in
hash_low_32.S and is only used by the 32-bit hash code, and all
nohash CPUs use the various _tlbil_* forms that are now moved to
a new file, tlb_nohash_low.S.
I moved all the definitions for that stuff out of
include/asm/tlbflush.h as they are really internal mm stuff, into
mm/mmu_decl.h
The code should have no functional changes. I kept some variants
inline for trivial forms on things like 40x and 8xx.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit f048aace29e007f2b642097e2da8231e0e9cce2d
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:38 2008 +0000
powerpc/mm: Add SMP support to no-hash TLB handling
This commit moves the whole no-hash TLB handling out of line into a
new tlb_nohash.c file, and implements some basic SMP support using
IPIs and/or broadcast tlbivax instructions.
Note that I'm using local invalidations for D->I cache coherency.
At worst, if another processor is trying to execute the same and
has the old entry in its TLB, it will just take a fault and re-do
the TLB flush locally (it won't re-do the cache flush in any case).
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 7c03d653cd257793dc40520c94e229b5fd0578e7
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:32 2008 +0000
powerpc/mm: Introduce MMU features
We're soon running out of CPU features and I need to add some new
ones for various MMU related bits, so this patch separates the MMU
features from the CPU features. I moved over the 32-bit MMU related
ones, added base features for MMU type families, but didn't move
over any 64-bit only feature yet.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2ca8cf738907180e7fbda90f25f32b86feda609f
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:29 2008 +0000
powerpc/mm: Rework context management for CPUs with no hash table
This reworks the context management code used by 4xx,8xx and
freescale BookE. It adds support for SMP by implementing a
concept of stale context map to lazily flush the TLB on
processors where a context may have been invalidated. This
also contains the ground work for generalizing such lazy TLB
flushing by just picking up a new PID and marking the old one
stale. This will be implemented later.
This is a first implementation that uses a global spinlock.
Ideally, we should try to get at least the fast path (context ID
already assigned) lockless or limited to a per context lock,
but for now this will do.
I tried to keep the UP case reasonably simple to avoid adding
too much overhead to 8xx which does a lot of context stealing
since it effectively has only 16 PIDs available.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 5e696617c425eb97bd943d781f3941fb1e8f0e5b
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:24 2008 +0000
powerpc/mm: Split mmu_context handling
This splits the mmu_context handling between 32-bit hash based
processors, 64-bit hash based processors and everybody else. This is
preliminary work for adding SMP support for BookE processors.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6d2170be4561293a6aa821c773687bd3f18e8206
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:22 2008 +0000
powerpc/4xx: Extended DCR support v2
This adds supports to the "extended" DCR addressing via the indirect
mfdcrx/mtdcrx instructions supported by some 4xx cores (440H6 and
later).
I enabled the feature for now only on AMCC 460 chips.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit fecba96268fc48ab9b4a016356a8f2371df25e64
Author: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 11:13:49 2008 +0000
powerpc: Add reboot notifier to Collaborative Memory Manager
When running Active Memory Sharing, pages can get marked as
"loaned" with the hypervisor by the CMM driver. This state gets
cleared by the system firmware when rebooting the partition.
When using kexec to boot a new kernel, this state never gets
cleared and the hypervisor and CMM driver can get out of sync
with respect to the number of pages currently marked "loaned".
Fix this by adding a reboot notifier to the CMM driver to deflate
the balloon and mark all pages as active.
Signed-off-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2218108e182fd8a6d9106077833ed7ad05fc8e75
Author: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 11:13:46 2008 +0000
powerpc: Disable Collaborative Memory Manager for kdump
When running Active Memory Sharing, the Collaborative Memory Manager
(CMM) may mark some pages as "loaned" with the hypervisor.
Periodically, the CMM will query the hypervisor for a loan request,
which is a single signed value. When kexec'ing into a kdump kernel,
the CMM driver in the kdump kernel is not aware of the pages the
previous kernel had marked as "loaned", so the hypervisor and the CMM
driver are out of sync. This results in the CMM driver getting a
negative loan request, which can then get treated as a large unsigned
value and can cause kdump to hang due to the CMM driver inflating too
large. Since there really is no clean way for the CMM driver in the
kdump kernel to clean this up, simply disable CMM in the kdump kernel.
This fixes hangs we were seeing doing kdump with AMS.
Signed-off-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 5d84e4bee044a740729ac172e684e743f5ad50fb
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue Dec 16 20:16:49 2008 +0000
powerpc/iseries: viodasd needs to depend on CONFIG_BLOCK
Otherwise you get lot of errors like these:
drivers/block/viodasd.c:72: error: dereferencing pointer to incomplete type
drivers/block/viodasd.c: In function 'viodasd_open':
drivers/block/viodasd.c:135: error: dereferencing pointer to incomplete type
drivers/block/viodasd.c: In function 'viodasd_release':
drivers/block/viodasd.c:184: error: dereferencing pointer to incomplete type
drivers/block/viodasd.c: In function 'viodasd_getgeo':
drivers/block/viodasd.c:209: error: dereferencing pointer to incomplete type
drivers/block/viodasd.c:214: error: implicit declaration of function
'get_capacity'
drivers/block/viodasd.c: At top level:
drivers/block/viodasd.c:222: error: variable 'viodasd_fops' has initializer
but incomplete type
drivers/block/viodasd.c:223: error: unknown field 'owner' specified in
initializer
Discovered by a randconfig build.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 368c1e3249afe0e59097e7df664435ae55fb9f8d
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 16 00:09:38 2008 +0000
hvc_console: Escape magic sysrq key
The ctrl-o (^O) is a common control key used by several applications,
such as vim, but hvc_console uses ^O as the magic-sysrq key. This
commit allows users to send ^O to applications by pressing ^O twice
in succession.
To implement this, this commit introduces a check if ^O is pressed
again if the sysrq_pressed variable is already set. In this case,
clear sysrq_pressed state and flip the ^O character to the tty. (The
old behavior has always set "sysrq_pressed" if ^O has been entered,
and it has not flipped the ^O character to the tty.)
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 532774ec7fa396da20ca724c0cf83d93ee76622f
Author: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 18:34:43 2008 +0000
powerpc: Pass a valid token to rtas_call() in phyp-dump code
ibm_configure_kernel_dump is passed as the token to rtas_call() is
never initialised. This sets it to something sane.
Signed-off-by: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Acked-by: Nathan Lynch <ntl@xxxxxxxxx>
Acked-by: Manish Ahuja <mahujam@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 7a2eab0d4e656341cc0f6481d722d410f0414f0b
Author: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 18:17:48 2008 +0000
powerpc: Protect against NULL pointer deref in phyp-dump code
print_dump_header() will be called at least once with a NULL pointer in
a normal boot sequence. If DEBUG is defined then we will dereference
the pointer and crash. Add a quick fix to exit early in the NULL pointer
case.
Signed-off-by: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Acked-by: Manish Ahuja <mahujam@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 8168b5400b06353293f9844976435886eb2a8ff2
Author: David Howells <dhowells@xxxxxxxxxx>
Date: Thu Dec 11 02:53:54 2008 +0000
powerpc: Rename struct vm_region to avoid conflict with NOMMU
Rename PowerPC's struct vm_region so that I can introduce my own
global version for NOMMU. It's feasible that the PowerPC version may
wish to use my global one instead.
The NOMMU vm_region struct defines areas of the physical memory map
that are under mmap. This may include chunks of RAM or regions of
memory mapped devices, such as flash. It is also used to retain
copies of file content so that shareable private memory mappings of
files can be made. As such, it may be compatible with what is
described in the banner comment for PowerPC's vm_region struct.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 13ba3c0092b4db272d1f643206c1b55f4fe415a6
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Wed Dec 10 14:46:06 2008 +0000
powerpc: Convert sysfs cache code to of_find_next_cache_node()
Using the common code means that more complete cache information will
provided in sysfs on platforms that don't use the l2-cache property
convention.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit b2ea25b958968c152c6fac0594f2c9aa8b59eb8d
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Wed Dec 10 20:16:07 2008 +0000
powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
The smp code uses cache information to populate cpu_core_map; change
it to use common code for cache lookup.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit e523f723d69cde44e10116d7f49b277da0c6702c
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Wed Dec 10 14:46:04 2008 +0000
powerpc: Add of_find_next_cache_node()
We have more than one piece of code that looks up cache nodes manually
using the "l2-cache" property. Add a common helper routine which does
this and handles ePAPR's "next-level-cache" property as well as
powermac.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 749820928a2fd47ff536773d869d2c3f8038b7d1
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Fri Dec 5 08:15:54 2008 +0000
of/gpio: Implement of_gpio_count()
This function is used to count how many GPIOs are specified for
a device node.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 7736a3db98bed028d0e5235f8958a730acfd822e
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Fri Dec 5 08:15:46 2008 +0000
of: of_parse_phandles_with_args() learns to differentiate 'hole' cells
Given this list (contains three gpio specifiers, one of which is a hole):
gpios = <&phandle1 1 2 3
0 /* a hole */
&phandle2 4 5 6>;
of_parse_phandles_with_args() would report -ENOENT for the `hole'
specifier item, the same error value is used to report the end of the
list, for example.
Sometimes we want to differentiate holes from real errors -- for
example when we want to count all the [syntax correct] specifiers.
With this patch of_parse_phandles_with_args() will report -EEXITS when
somebody requested to parse a hole.
Also, make the out_{node,args} arguments optional, when counting we
don't really need the out values.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit c1bb7c6d04ebdf48998649100c5267a9139debf5
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Fri Dec 5 08:15:39 2008 +0000
of: Minor simplification for the of_parse_phandles_with_args()
By using 'list++' in the beginning we can simplify the code a
little bit.
Suggested-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 74b7ff48a93f44198ac03cc4e628d713f53d4668
Author: Matthew Ranostay <mranostay@xxxxxxxxxxxxxxxxx>
Date: Sat Dec 20 17:47:24 2008 -0500
ALSA: hda: fix incorrect mixer index values for 92hd83xx
Fixed incorrect mixer index values for 92hd83xx codec's audio
input mixer.
Signed-off-by: Matthew Ranostay <mranostay@xxxxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit f8ccbf65afde5df81a6238b9dc92868fbbd397f7
Author: Matthew Ranostay <mranostay@xxxxxxxxxxxxxxxxx>
Date: Sat Dec 20 17:36:28 2008 -0500
ALSA: hda: dinput_mux check
Add check to determine if dinput_mux is set by any of patch_stac*()
functions,
otherwise a invalid pointer my be referenced causing gibberish to mixer
values.
Signed-off-by: Matthew Ranostay <mranostay@xxxxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit ebef7cfc81942686a994ca6239b195040f5d1e4d
Merge: 6bcdbd55b4c603d9741398d081133fcc50a10b6c
3d4758299fa6180ff9304634c67ffdd44272c8e8
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 23:43:06 2008 +0100
Merge branch 'topic/ca0106-spdif-stream' into topic/ca0106
commit 6bcdbd55b4c603d9741398d081133fcc50a10b6c
Merge: 6a8436419d1b77b24d82bd90354adc4baa393566
72077aa336d0f4c5e3c7014d7471c79bc69873bb
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 23:43:00 2008 +0100
Merge branch 'topic/ca0106-resume' into topic/ca0106
commit 6a8436419d1b77b24d82bd90354adc4baa393566
Merge: 55fa518867978e1f5fd8353098f80d125ac734d7
ff75427a7f641c4468610fbda2ccb69218174cd1
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 23:42:55 2008 +0100
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
commit 8326e32c1e148820d50dc460e1cb4a6cb6884ff2
Merge: 69dfaefee4a2dfdfee3488a306403fe1e51f0be5
32e176c14d7a425b681ef003c9061001ddb7fc7b
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 23:41:18 2008 +0100
Merge branch 'topic/hda-resume-fix' into topic/hda
commit 55fa518867978e1f5fd8353098f80d125ac734d7
Merge: bb1f24bf00a85f666b56a09b7cdbfd221af16c2c
eea0579fc85e64e9f05361d5aacf496fe7a151aa
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 23:39:47 2008 +0100
Merge branch 'topic/pcsp-fix' into topic/misc
commit 69dfaefee4a2dfdfee3488a306403fe1e51f0be5
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 16:57:50 2008 +0100
ALSA: hda - Add quirk for another HP dv7
Added the model=hp-m4 quirk for another HP dv7 (103c:30fc) with IDT
92HD71b* codec.
Reference: Novell bnc#461108
https://bugzilla.novell.com/show_bug.cgi?id=461108
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit a31501d1041c9d0a6c3f520736ae2b2fa081493a
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 16:50:53 2008 +0100
ALSA: ASoC - Add missing __devexit annotation to wm8350.c
Added the missing __devexit annotation to wm8350_codec_remove():
sound/soc/codecs/wm8350.c:1546: warning: 'wm8350_codec_remove' defined
but not used
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit d6f833965e594015ee05341e43ff4a86f11596b3
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 19 13:05:25 2008 -0700
ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
Sense DaVinci does not support true I2S mode and
we don't have to use the hack, use dsp_b mode instead
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 9e031624d50c82a47671e09cc996eebb9e36f698
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 19 13:05:23 2008 -0700
ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
Fix the meaning of SND_SOC_DAIFMT_NB_NF to match that
used in the codec.
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit a24f4f682661b8069d374a9197bc491525a7c799
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 19 13:05:22 2008 -0700
ALSA: ASoC: tlv320aic3x add dsp_a
Add SND_SOC_DAIFMT_DSP_A mode option.
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 07d8d9dca4615821d928f4b5087fdc61e292e1dc
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 19 13:05:24 2008 -0700
ALSA: ASoC: DaVinci: document I2S limitations
DaVinci does not support true I2S or right justified
mode so not all I2S codecs will work with it when the codec is
master. Document this limitation.
Add dsp_a, dsp_b mode options
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 69ab820c862250d460dfaaf82164972a4a69418a
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 12:36:44 2008 -0700
ALSA: ASoC: DaVinci: davinci-i2s clean up
Minor, just move a block of code to make next patch clearer.
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 21903c1c9ecb7a210eb985aa8d82ad68c78283cc
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 12:36:43 2008 -0700
ALSA: ASoC: DaVinci: davinci-i2s clean up
Just at little cleanup of davinci_i2s_set_dai_fmt
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 664b4af859d43714fd2a90aa434e454355659d0e
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 12:36:41 2008 -0700
ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
Document the current polarity choices.
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 1152a1959f8440db9536f6df758274443f9b5b37
Author: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 12:36:40 2008 -0700
ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
Add constants with a value of 0 to show more explicitly
what is being requested.
Signed-off-by: Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit ff75427a7f641c4468610fbda2ccb69218174cd1
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 11:20:55 2008 +0100
ALSA: ca0106 - disable 44.1kHz capture
The capture with 44.1kHz on ca0106 seems to cause loud noises on
later playbacks, which doesn't support 44.1kHz. A simple fix is to
disable 44.1kHz, as the "default" PCM with dsnoop is anyway only with
48kHz.
Reference: Novell bnc#447624
https://bugzilla.novell.com/show_bug.cgi?id=447624
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 72077aa336d0f4c5e3c7014d7471c79bc69873bb
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 11:12:51 2008 +0100
ALSA: ca0106 - Add missing card->private_data initialization
Added the missing card->private_data initialization that caused obvious
problems at PM.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 50232d62cace101e03f8f40ca151b978c0db5a0d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 20 09:42:09 2008 +0100
ALSA: ca0106 - Check ac97 availability at PM
Check the availability of ac97 at PM suspend/resume callbacks.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9
Author: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Date: Fri Dec 19 15:17:02 2008 +0100
x86, bts: memory accounting
Impact: move the BTS buffer accounting to the mlock bucket
Add alloc_locked_buffer() and free_locked_buffer() functions to mm/mlock.c
to kalloc a buffer and account the locked memory to current.
Account the memory for the BTS buffer to the tracer.
Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bf53de907dfdaac178c92d774aae7370d7b97d20
Author: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Date: Fri Dec 19 15:10:24 2008 +0100
x86, bts: add fork and exit handling
Impact: introduce new ptrace facility
Add arch_ptrace_untrace() function that is called when the tracer
detaches (either voluntarily or when the tracing task dies);
ptrace_disable() is only called on a voluntary detach.
Add ptrace_fork() and arch_ptrace_fork(). They are called when a
traced task is forked.
Clear DS and BTS related fields on fork.
Release DS resources and reclaim memory in ptrace_untrace(). This
releases resources already when the tracing task dies. We used to do
that when the traced task dies.
Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 67bac792cd0c05b4b6e0393c32605b028b8dd533
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Fri Dec 19 13:47:30 2008 -0800
x86: PAT: pfnmap documentation update changes
Impact: Documentation only.
Documentation updates as per Randy Dunlap's comments.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 34801ba9bf0381fcf0e2b08179d2c07f2c6ede74
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Fri Dec 19 13:47:29 2008 -0800
x86: PAT: move track untrack pfnmap stubs to asm-generic
Impact: Cleanup and branch hints only.
Move the track and untrack pfn stub routines from memory.c to asm-generic.
Also add unlikely to pfnmap related calls in fork and exit path.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 982d789ab76c8a11426852fec2fdf2f412e21c0c
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Fri Dec 19 13:47:28 2008 -0800
x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
Impact: Cleanup - removes a new function in favor of a recently modified
older one.
Replace follow_pfnmap_pte in pat code with follow_phys. follow_phys lso
returns protection eliminating the need of pte_pgprot call. Using
follow_phys
also eliminates the need for pte_pa.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit d87fe6607c31944f7572f965c1507ae77026c133
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Fri Dec 19 13:47:27 2008 -0800
x86: PAT: modify follow_phys to return phys_addr prot and return value
Impact: Changes and globalizes an existing static interface.
Follow_phys does similar things as follow_pfnmap_pte. Make a minor change
to follow_phys so that it can be used in place of follow_pfnmap_pte.
Physical address return value with 0 as error return does not work in
follow_phys as the actual physical address 0 mapping may exist in pte.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 6bd9cd50c830eb88d571c492ec370a30bf999e15
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Fri Dec 19 13:47:26 2008 -0800
x86: PAT: clarify is_linear_pfn_mapping() interface
Impact: Documentation only
Incremental patches to address the review comments from Nick Piggin
for v3 version of x86 PAT pfnmap changes patchset here
http://lkml.indiana.edu/hypermail/linux/kernel/0812.2/01330.html
This patch:
Clarify is_linear_pfn_mapping() and its usage.
It is used by x86 PAT code for performance reasons. Identifying pfnmap
as linear over entire vma helps speedup reserve and free of memtype
for the region.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 8403295e0fa460f6240e2d781e25dc29189f33c7
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Fri Dec 19 14:25:50 2008 -0800
x86: ia32_signal: remove unnecessary declaration
Impact: cleanup
No need to declare do_signal().
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 34945ede31071ac7d72270cc6c1893323f392b3f
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Fri Dec 19 22:33:52 2008 +0530
x86: common.c boot_cpu_stack and boot_exception_stacks should be static
Impact: cleanup, avoid sparse warnings, reduce kernel size a bit
Fixes these sparse warnings:
arch/x86/kernel/cpu/common.c:869:6: warning: symbol 'boot_cpu_stack' was
not declared. Should it be static?
arch/x86/kernel/cpu/common.c:910:6: warning: symbol
'boot_exception_stacks' was not declared. Should it be static?
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 74192246910ff4fb95309ba1a683215644beeb62
Author: James Morris <jmorris@xxxxxxxxx>
Date: Fri Dec 19 11:41:10 2008 +1100
SELinux: don't check permissions for kernel mounts
Don't bother checking permissions when the kernel performs an
internal mount, as this should always be allowed.
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
Acked-by: Stephen Smalley <sds@xxxxxxxxxxxxx>
commit 12204e24b1330428c3062faee10a0d80b8a5cb61
Author: James Morris <jmorris@xxxxxxxxx>
Date: Fri Dec 19 10:44:42 2008 +1100
security: pass mount flags to security_sb_kern_mount()
Pass mount flags to security_sb_kern_mount(), so security modules
can determine if a mount operation is being performed by the kernel.
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
Acked-by: Stephen Smalley <sds@xxxxxxxxxxxxx>
commit 459c19f524a9d89c65717a7d061d5f11ecf6bcb8
Author: Stephen Smalley <sds@xxxxxxxxxxxxx>
Date: Fri Dec 5 09:12:19 2008 -0500
SELinux: correctly detect proc filesystems of the form "proc/foo"
Map all of these proc/ filesystem types to "proc" for the policy lookup at
filesystem mount time.
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 9bb482476c6c9d1ae033306440c51ceac93ea80c
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:30:08 2008 +0000
allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
Building upon parts of the module stripping patch, this patch
introduces similar stripping for vmlinux when CONFIG_KALLSYMS_ALL=y.
Using CONFIG_KALLSYMS_STRIP_GENERATED reduces the overhead of
CONFIG_KALLSYMS_ALL from 245k/310k to 65k/80k for the (i386/x86-64)
kernels I tested with.
The patch also does away with the need to special case the kallsyms-
internal symbols by making them available even in the first linking
stage.
While it is a generated file, the patch includes the changes to
scripts/genksyms/keywords.c_shipped, as I'm unsure what the procedure
here is.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit ad7a953c522ceb496611d127e51e278bfe0ff483
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:28:14 2008 +0000
kbuild: strip generated symbols from *.ko
This patch changes the way __crc_ symbols are being resolved from
using ld to do so to using the assembler, thus allowing these symbols
to be marked local (the linker creates then as global ones) and hence
allow stripping (for modules) or ignoring (for vmlinux) them. While at
this, also strip other generated symbols during module installation.
One potentially debatable point is the handling of the flags passeed
to gcc when translating the intermediate assembly file into an object:
passing $(c_flags) unchanged doesn't work as gcc passes --gdwarf2 to
gas whenever is sees any -g* option, even for -g0, and despite the
fact that the compiler would have already produced all necessary debug
info in the C->assembly translation phase. I took the approach of just
filtering out all -g* options, but an alternative to such negative
filtering might be to have a positive filter which might, in the ideal
case allow just all the -Wa,* options to pass through.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 37a8d9f67f18de1e2cbc7387311ce22d4dbff518
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Fri Dec 19 21:38:09 2008 +0100
kbuild: simplify use of genksyms
Avoid duplicating long list of options in two places
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 9cf7f247bd0cd21e475c71a4e018bb612ef02aab
Author: Michael Buesch <mb@xxxxxxxxx>
Date: Fri Dec 19 20:24:30 2008 +0100
b43: Add key memory dumping
This adds an option to dump all crypto related memory to
the kernel log.
Obviously, it should not be enabled on productive systems. ;)
Signed-off-by: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b929ecf7965c2dab7e373f390ac5fc563011484d
Author: Michael Buesch <mb@xxxxxxxxx>
Date: Fri Dec 19 18:40:00 2008 +0100
b43: Suspend MAC while killing the radio
We should suspend the MAC, before we kill the radio. This gives
the MAC a chance to leave any TX/RX state and it avoids races on
the PHY/RADIO registers.
Signed-off-by: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fd6effcaf8a894c0a0f602b943dbc54a170d4418
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Thu Dec 18 23:23:05 2008 -0500
ath5k: correct packet length in tx descriptors
Packet length calculation (which includes frame check sequence)
should take into account whether we add a pad field or not.
Extract the calculation into a helper and use it in both places.
Changes to desc.c
Changes-licensed-under: ISC
Changes to ath5k.h, base.c
Changes-licensed-under: 3-Clause-BSD
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 520eb82076993b7f55ef9b80771d264272e5127b
Author: Kalle Valo <kalle.valo@xxxxxxxxx>
Date: Thu Dec 18 23:35:27 2008 +0200
mac80211: implement dynamic power save
This patch implements dynamic power save for mac80211. Basically it
means enabling power save mode after an idle period. Implementing it
dynamically gives a good compromise of low power consumption and low
latency. Some hardware have support for this in firmware, but some
require the host to do it.
The dynamic power save is implemented by adding an timeout to
ieee80211_subif_start_xmit(). The timeout can be enabled from userspace
with Wireless Extensions. For example, the command below enables the
dynamic power save and sets the time timeout to 500 ms:
iwconfig wlan0 power timeout 500m
Power save now only works with devices which handle power save in firmware.
It's also disabled by default and the heuristics when and how to enable is
considered as a policy decision and will be left for the userspace to
handle.
In case the firmware has support for this, drivers can disable this feature
with IEEE80211_HW_NO_STACK_DYNAMIC_PS.
Big thanks to Johannes Berg for the help with the design and code.
Signed-off-by: Kalle Valo <kalle.valo@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ce7c9111a97492d04c504f40736a669c235d664a
Author: Kalle Valo <kalle.valo@xxxxxxxxx>
Date: Thu Dec 18 23:35:20 2008 +0200
mac80211: track master queue status
This is a preparation for the dynamic power save support. In future there
are
two paths to stop the master queues and we need to track this properly to
avoid starting queues incorrectly. Implement this by adding a status
array for each queue.
The original idea and design is from Johannes Berg, I just did
the implementation based on his notes. All the bugs are mine, of course.
Signed-off-by: Kalle Valo <kalle.valo@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e0cb686ff879dc9ac045ad7258ec687088d4e450
Author: Kalle Valo <kalle.valo@xxxxxxxxx>
Date: Thu Dec 18 23:35:13 2008 +0200
mac80211: enable IEEE80211_CONF_PS only when associated
Also disable power save when disassociated. It makes no sense to have
power save enabled while disassociated.
iwlwifi seems to have this check in the driver, but it's better to do this
in mac80211 instead.
Signed-off-by: Kalle Valo <kalle.valo@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d10d0e5707fb7b8afa7e68a14d69e752604ee294
Author: Michael Buesch <mb@xxxxxxxxx>
Date: Thu Dec 18 22:13:39 2008 +0100
b43: Fix some MAC locking
This fixes some locking w.r.t. the lower MAC (firmware).
It also removes a lot of ancient IRQ-locking that's not needed anymore.
We simply suspend the MAC. That's easier and causes less trouble.
Signed-off-by: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0e7690f1e9ee1e762f27678d2ea10e4c1fde3236
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Thu Dec 18 18:04:51 2008 +0200
iwlwifi: iwl-tx.c cleanup (remove unused parameter and unused local
variable).
This patch removes unused parameter and unused local variable in
methods in iwl-tx.c:
- Remove a parameter (is_unicast) from iwl_tx_cmd_build_basic().
- Remove an unused variable name unicast from iwl_tx_skb().
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit be2864cfff2fe4b599b46f03cce1e7689e05c60c
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Thu Dec 18 14:33:00 2008 +0200
ath9k: Fixed RX decryption status reporting
The RX code in ath9k uses sc_keymap to figure out whether a default
key was used. However, the default key entries in sc_keymap were
always set and as such, frames could have been claimed to be decrypted
by hardware when they were not. This can cause problems especially
with TKIP since mac80211 is validating the Michael MIC in the frame
and this will result in MIC failure and potentially TKIP
countermeasures if the frame was not decrypted correctly.
Change key cache slot allocation to mark only the keys that really
have been used in sc_keymap to avoid the issue. The key cache slot
selection routines are now internally avoiding the slots that may be
needed for TKIP group keys.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ea6121328885640c137b0a8830f67ca6c386a24a
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Thu Dec 18 14:31:10 2008 +0200
ath9k: Fix key cache slot selection for splitmic
ath_reserve_key_cache_slot() was obviously supposed to return an index
to a free slot, not reserved one. This could have caused problems with
hardware revisions that use splitmic.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aa33de09a849bd65b1201e1aec42e3e412c14cf6
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Thu Dec 18 11:40:16 2008 +0530
ath9k: Protect config() callback with a mutex
This should fix the timeout issues seen when using wpa_supplicant.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5e3f308997f53d00e8cbebdb89d4f6e347aa963a
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Wed Dec 17 14:26:59 2008 -0600
mac80211: Print unknown packet type in tasklet_handler
In stress testing p54usb, the WARN_ON() in ieee80211_tasklet_handler() was
triggered; however, there is no logging of the received value for packet
type. Adding that feature will improve the warning.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6110781af080c007b2202187a8518920e03d5748
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Wed Dec 17 12:04:43 2008 +0100
p54usb: bring first generation devices back to life
This patch fixes a serious regression (introduced by:
"p54: fix memory management")
that affected isl3886+net2280 usb devices operation.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Tested-by: Artur Skawina <art.08.09@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6ace2891a1d632303283816ae050849da48df142
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Wed Dec 17 13:32:17 2008 +0200
ath9k: Key cache allocation for AP mode
Enhance allocation of key cache entries to support multiple pairwise
keys to fix AP mode with more than one associated STA.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f66000f7a39769b0ce2355fca13c40ac2f1c39db
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Wed Dec 17 13:30:31 2008 +0200
ath9k: Fix a NULL pointer dereference in ath_rate_get
It looks like mac80211 may try to send unicast frames to a STA that
does not have a STA entry. We need to make sure that that is caught in
the rate control code before dereferencing STA data.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 91f39e8eea725347b6a82d1e35e512ec8b298b0b
Author: Jay Sternberg <jay.e.sternberg@xxxxxxxxxxxxxxx>
Date: Wed Dec 17 16:52:34 2008 +0800
iwlwifi: indicate txpower is off in sysfs
The patch checks if the radio is disabled before displaying the tx power
level. Previously when the txpower was set off show_tx_power still
returned the prior power level. Now it will indicate the power has been
turned off.
Signed-off-by: Jay Sternberg <jay.e.sternberg@xxxxxxxxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f1bc4ac61f2c08515afd80c6dc3962aa6d0b138b
Author: Zhu Yi <yi.zhu@xxxxxxxxx>
Date: Wed Dec 17 16:52:33 2008 +0800
iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
Previously we allocate Rx SKB with GFP_ATOMIC flag. This is because we need
to hold a spinlock to protect the two rx_used and rx_free lists operation
in the rxq.
spin_lock();
...
element = rxq->rx_used.next;
element->skb = alloc_skb(..., GFP_ATOMIC);
list_del(element);
list_add_tail(&element->list, &rxq->rx_free);
...
spin_unlock();
After spliting the rx_used delete and rx_free insert into two operations,
we don't require the skb allocation in an atomic context any more (the
function itself is scheduled in a workqueue).
spin_lock();
...
element = rxq->rx_used.next;
list_del(element);
...
spin_unlock();
...
element->skb = alloc_skb(..., GFP_KERNEL);
...
spin_lock()
...
list_add_tail(&element->list, &rxq->rx_free);
...
spin_unlock();
This patch should fix the "iwlagn: Can not allocate SKB buffers" warning
we see recently.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4087f6f68cdbd2845c7e54236bae1b058a7b827b
Author: Wu, Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Dec 17 16:52:32 2008 +0800
iwlwifi: use meaningful vars in _iwl_poll_bit()
Rename vars in _iwl_poll_bit() to better reflect the truth.
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit febf3370c63b4ea7fc1cedb9a73ac37e3cb21079
Author: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Dec 17 16:52:31 2008 +0800
iwlwifi: remove useless goto
The patch removes some useless goto in code cleanup.
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 95aa194ac4a8fee0aea64c9609e70211cd057ad2
Author: Wu, Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Dec 17 16:52:30 2008 +0800
iwlwifi: use type uint for module param debug
This enables one to change the debug level at bit 31.
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c3a739fa3507d1d5b3d2cb6cc491edeef8fa54c0
Author: Wu, Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Dec 17 16:52:29 2008 +0800
iwlwifi: update comments on the debug interface
Bring up-to-date some comments on the location of debug files.
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5c11ec60ef2eb8fb409b2c0a427e5a8ab6ee05f8
Author: Wu, Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Dec 17 16:52:28 2008 +0800
iwlwifi: add line feed to printk
This adds line feed to printk.
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 34c22cf93d1446791c966c878cc691e07c39d8d3
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Wed Dec 17 16:52:27 2008 +0800
iwlwifi: cleanup iwl-dev.h
The patch removes unused definition and moves code to proper places.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 135541215ca87ff00c269e65bcaef0bdcb99aab9
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Tue Dec 16 22:38:29 2008 +0200
mac80211: fix a typo in ieee80211_send_assoc() method.
This patch fixes a typo in ieee80211_send_assoc(), net/mac80211/mlme.c.
The error is usage of a wrong member when building
the ie80211 management frame (it should be assoc_req, and not reassoc_req).
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 73ec1cc28ebc7854a376cde53f62d487e127fbca
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Tue Dec 16 09:37:07 2008 +0200
iwlwifi: remove a parameter (dest) from *_fill_beacon_frame() methods.
This patch removes a parameter (dest) from iwl_fill_beacon_frame()
(iwl-agn.c)
and from iwl3945_fill_beacon_frame(). (iwl-3945.c,iwl-3945.h)
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ca8a8560569c5eb954cb18c3a91087797ffa81a4
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Tue Dec 16 12:37:38 2008 +0530
ath9k: Move rate control alg register/unregister to appropriate place
This patch makes sure the rate control alg is registered/unregistered
only once for this module.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9bf9fca8dea70116016d32c2bf3f83170c8fba76
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 15 20:40:46 2008 +0530
ath9k: Synchronize DMA transfer with CPU at right place
This patch does pci_dma_sync_single_for_cpu() before accessing
the header of the frame and queueing the same buffer into h/w.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f7a276a625e0b980185d2eb8e8e3e9425a708bee
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Mon Dec 15 16:02:04 2008 +0200
ath9k: Remove MAC header pad before reporting TX status
Remove the possible MAC header pad before reporting TX status to
mac80211. This pad is hardware specific operation and should not be
exposed outside the driver. This fixes the frame body in monitor
interfaces that could be used to check on TX status for transmitted
frames.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit da027ca00a48715364da9a94d4b663029add528d
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Mon Dec 15 15:44:53 2008 +0200
ath9k: Fix TX status reporting for retries and MCS index
The count field in struct ieee80211_tx_rate does not include the final
successful attempt, so only report retries here.
Fix the struct ieee80211_tx_rate::idx field when MCS was used. It is
supposed to be the MCS index, not an internal index to the rate
control algorithm table.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8d6f658e211a3c6ff808f7fc6ebb30239457eabc
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Mon Dec 15 10:37:50 2008 +0200
mac80211: Remove radiotap rate-present flag for HT
Since we do not currently report HT rates (MCS index) in radiotap
header for HT rates, we should not claim the rate is present. The rate
octet itself is used as padding in this case, so only the it_present
flag needs to be removed in case of HT rates.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d85882273367e98aecb9ff11a9d76515a6d37131
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Sun Dec 14 12:18:09 2008 -0600
rtl8187: Fix crash on unload when using SLUB debug
Reported-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
After the code was modified to use urb anchors ("rtl8187: Use usb anchor
facilities to manage urbs"), rtl8187 began generating an intermittent GPF
on shutdown when using SLUB with debugging enabled. Furthermore, rebooting
the system with a ping running caused a GPF every time. There are two
problems:
(1) incorrect locking in the rtl8187_rx_cb() routine, a pre-existing bug
that
apparently had not been triggered before, and (2) duplicate freeing of
receive
skbs that was probably introduced with the change to anchors.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Tested-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0a5ec96ad68516582023a877aceff9db7636d141
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sun Dec 14 15:05:42 2008 +0100
p54: remove free_on_tx parameter
This patch simplifies the tx code a bit and will be necessary for
the upcoming stlc45xx<->p54 port.
In detail: we no longer have to tell all back-end drivers directly,
if we want to free a frame right after it was send to the firmware,
or if we do it in the library callback later.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 69ba3e5d74a467a64248cd90ccafb524b1fddcb5
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sun Dec 14 14:45:30 2008 +0100
p54: more accurate rssi to dBm conversion
This patch replaces the static rssi auto calibration data
with more precise values out of the device's eeprom.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit da9f57eade0a743450a201645db7fc5ac0809900
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Sat Dec 13 18:09:56 2008 -0600
rtl8187: Fix error returns
There are two places in the rtl8187 code where a routine was returning zero
(OK) when it should have been returning an error.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Acked-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 23827926eb5ce5cb944ebbd96d22297a2582d45d
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sat Dec 13 21:33:13 2008 +0200
libertas: use roundup instead of opencoding
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ee370ceda823435fe75be7dd4ed7b0e3dc3108b9
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Dec 13 16:45:38 2008 +0100
p54: update ACK failure statistic counter in real-time
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 54fdb040b4760d5b2994d15c1371e297679420e9
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Dec 13 14:14:20 2008 +0100
p54: move statistic timer update routine into a workqueue
This patch moves a good chunk of code from the former statistic update
timer routine into a workqueue, which is kindly provided by mac80211.
Also as a nice side-effect we can lay the foundation for other
essential housekeeping features we want to do in the future.
e.g:
- drain the (clogged) tx_queue.
- initiate bursts.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d5e490362feb648048ef20db9b0b2531d5425775
Author: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Date: Fri Dec 12 08:22:15 2008 -0800
iwlagn: fix agn rate scaling
Rate scaling in agn can be broken because of these two problems
1- the LQ command could not sent, we try to call LQ command before
post association will be rejected, this will cause the driver to
break in rs_tx_status reporting initial rate does not match.
2- In rs_rate_init we can get a value of 12, rate 60, for
last_txrate_idx, this rate only valid in SISO/MIMO mode only
Signed-off-by: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b8d476c8cb64a1640d8762aa442b8a73fa74b7d5
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Fri Dec 12 17:08:31 2008 +0200
mac80211: Send Layer 2 Update frame on reassociation
When a STA roams back to the same AP before the previous STA entry has
expired, a new STA entry is not added in mac80211. However, a Layer 2
Update frame still needs to be transmitted to update layer 2 devices
about the new location for the STA. Without this, switches may
continue to forward frames to the previous (now incorrect) port when
STA roams between APs.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0fe45b1debba7302155b62f3829119a1185a4f5a
Author: Benoit PAPILLAULT <benoit.papillault@xxxxxxx>
Date: Fri Dec 12 15:29:58 2008 +0100
ath5k: fix 802.11 header padding on RX, unpadding on TX
Padding the 802.11 header to a multiple of 4 bytes needs to be done only for
frames with a body. This fixes a bug where 2 bytes were missing in monitor
mode for ACK frames. Inspired by a patch from Jouni Malinen on ath9k.
Ref: http://bugzilla.kernel.org/show_bug.cgi?id=12101 :
Signed-off-by: Benoit Papillault <benoit.papillault@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit baad1d921b1565b6f08f60c035531d13ad8afa82
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Fri Dec 12 14:38:34 2008 +0200
ath9k: Report HT rates in RX status
Fix and clean up the RX status reporting by getting rid of code that
used internal rate tables and ratekbps calculation. The correct value
is now reported with MCS index instead of the old mechanism that
defaulted to using the highest legacy rate.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0fb8ca45eb164c405eef8978f26829f9348b4d4d
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Fri Dec 12 14:38:33 2008 +0200
mac80211: Add HT rates into RX status reporting
This patch adds option for HT-enabled drivers to report HT rates
(HT20/HT40, short GI, MCS index) to mac80211. These rates are
currently not in the rate table, so the rate_idx is used to indicate
MCS index.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9d8eed12dbc04f8ed70090da14211c808b5a8d81
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Dec 12 11:59:07 2008 +0530
ath9k: Do not use association state to update rate table
Now that HT information is made available to the driver through
config() callback, the channel type can be calculated whenever
setting the channel. Update the rate table accordingly with the new
channel type.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 094d05dc32fc2930e381189a942016e5561775d9
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Dec 12 11:57:43 2008 +0530
mac80211: Fix HT channel selection
HT management is done differently for AP and STA modes, unify
to just the ->config() callback since HT is fundamentally a
PHY property and cannot be per-BSS.
Rename enum nl80211_sec_chan_offset as nl80211_channel_type to denote
the channel type ( NO_HT, HT20, HT40+, HT40- ).
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 420e7fabd9c6d907280ed6b3e40eef425c5d8d8d
Author: Henning Rogge <hrogge@xxxxxxxxxxxxxx>
Date: Thu Dec 11 22:04:19 2008 +0100
nl80211: Add signal strength and bandwith to nl80211station info
This patch adds signal strength and transmission bitrate
to the station_info of nl80211.
Signed-off-by: Henning Rogge <rogge@xxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a1d94aa5560dc6b06baf30ae477115b51dc25461
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Fri Dec 19 08:49:30 2008 -0800
kernel-doc: check for extra kernel-doc notations
Add functionality to check for function parameters or structure (or
union/typedef/enum) field members that are described in kernel-doc but
are not part of the expected (declared) parameters or structure.
These generate warnings that are called "Excess" descriptions.
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit eb63212868c348cc6d3ec6929d7d98f7d29493e9
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 16:39:48 2008 +0100
ALSA: hda - Power up always when no jack detection is available
When no jack detection is available, the pins should be always
turned on since it can't be turned on/off dynamically via unsol
events.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 213cc060797378059a28ebc5c539f3e9a80160bd
Author: Pekka J Enberg <penberg@xxxxxxxxxxxxxx>
Date: Fri Dec 19 12:08:39 2008 +0200
ftrace: introduce tracing_reset_online_cpus() helper
Impact: cleanup
This patch factors out common code from multiple tracers into a
tracing_reset_online_cpus() function and converts the tracers to use it.
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9158923228822c08ed3116bfe21472261a05a725
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 15:59:40 2008 +0100
ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
Fixed "unused varible" warnings in patch_sigmatel.c that have been
introduced by the last changes.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 6030634ac3dc818d2eafa3ddf00abba88918b3bd
Merge: d4d9cd0338892e7f0d65f8a110473d175535cd5d
766245348db4b047a9b53548b5b893cd5115decc
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 15:43:24 2008 +0100
Merge branch 'topic/hda-stac-fix' into topic/hda
commit 70043058a6968917c00c8d4cff5bfc0e095831ec
Merge: 40aa4a30d0fd075fb934de4ee8163056827052ab
19b3f31609dc8be3a56c78dcb7da723f10f7009c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 15:36:58 2008 +0100
Merge branch 'fix/asoc' into topic/asoc
commit d4d9cd0338892e7f0d65f8a110473d175535cd5d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 15:19:11 2008 +0100
ALSA: hda - Add probe_only option
Added probe_only module option to hd-audio driver.
This option specifies whether the driver creates and initializes the
codec-parser after probing. When this option is set, the driver skips
the codec parsing and initialization but gives you proc and other
accesses. It's useful to see the initial codec state for debugging.
The default of this value is off, so the default behavior is as same
as before.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 766245348db4b047a9b53548b5b893cd5115decc
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 10:09:47 2008 +0100
ALSA: hda - Use more distinct name for a unique volume in STAC/IDT
When the line_out has only one DAC and it's unique (i.e. not shared
by other outputs), assign a more reasonable and distinct mixer name
such as "Headphone" or "Speaker".
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c21ca4a872697aeda4fe91bf9b6cc8380c62827c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 09:26:08 2008 +0100
ALSA: hda - Rework on STAC/IDT auto-configuration code
The current auto-configuration code has several problems especially
for the new IDT codecs, e.g. wrong assignment of pins and DACs or
coupled volume for speaker and headphone.
This patch is a fairly large rewrite of the auto-configuration code.
Some remaks
- mic_switch and line_switch contain NIDs instead of bool
- dac_list isn't fixed for IDT 92HD* codecs now, they are all probed
- extra HP and speakers are stored in extra_dacs[].
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 03c6901ea22bbb532586334d5b79941ccf56d5b0
Merge: 692f90421d3716ef0d0f120d9d2c9684009a4a01
8f55c1e51fbb03998708bdd97d5b6665ab92462d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 14:24:13 2008 +0100
Merge branch 'fix/hda' into topic/hda
commit 8df0f70751dc0e51d0550caee3416339183c5767
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 13:55:17 2008 +0100
ALSA: ca0106 - Fix typo in resume code
The register and channel_id pair were twisted in the pm code...
Oh my.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 692f90421d3716ef0d0f120d9d2c9684009a4a01
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 12:44:46 2008 +0100
ALSA: hda - Fix HD-Audio.txt reference of model list
The model list is now in HD-Audio-Models.txt.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 3d4758299fa6180ff9304634c67ffdd44272c8e8
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 12:13:18 2008 +0100
ALSA: ca0106 - Add IEC958 PCM Stream controls
Added "IEC958 PCM Stream" controls for the per-stream IEC958 status
bits. Using this instead of "IEC958 Default" is safer since the status
bits will be recovered to the default states after closing the PCM
stream.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 86effd7e12ca63cecfd218717473d606e138e5e1
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 12:04:06 2008 +0100
ALSA: ca0106 - Don't override the values at resume
Don't override some values in ca0106_init_chip() at resume.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit abe1dfab60e1839d115930286cb421f5a5b193f3
Author: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Nov 26 14:35:22 2008 +0800
ACPI: don't cond_resched() when irqs_disabled()
The ACPI interpreter usually runs with irqs enabled.
However, during suspend/resume it runs with
irqs disabled to evaluate _GTS/_BFS, as well as
by irqrouter_resume() which evaluates _CRS, _PRS, _SRS.
http://bugzilla.kernel.org/show_bug.cgi?id=12252
Signed-off-by: Wu Fengguang <wfg@xxxxxxxxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit e76f42761197dd6e9405e2eeb35932acfede115a
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Nov 13 17:30:13 2008 -0600
ACPI: fix 2.6.28 acpi.debug_level regression
acpi_early_init() was changed to over-write the cmdline param,
making it really inconvenient to set debug flags at boot-time.
Also,
This sets the default level to "info", which is what all the ACPI
drivers use. So to enable messages from drivers, you only have to
supply the "layer" (a.k.a. "component"). For non-"info" ACPI core
and ACPI interpreter messages, you have to supply both level and
layer masks, as before.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 4f2d23e1c3fe0abaf87fead3033c6cc3671b4d1c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 10:14:13 2008 +0100
ALSA: hda - Use snd_hda_ctl_add() in patch_sigmatel.c
Fixed the call of snd_ctl_add() by replacing with snd_hda_ctl_add()
so that this mixer element can be tracked for re-configuration.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 827057f5c12f5e10dc0279596db940aa6ddf8d9b
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 10:12:02 2008 +0100
ALSA: hda - Add missing initializations of amp and verb caches
The re-initializations of codec amp and verb caches are missing
at reconfig, which may cause Oops occasionally.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 30cd324e9787ccc9a5ede59742d5409857550692
Merge: c71dd42db2c6f1637b92502a214587431c1a6ad2
6d102bc68f3dd2ae0e305b09170b1751aa67baeb
3d9101e92529e1ff6014f95a69afc82f37b9b13a
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 19 09:42:40 2008 +0100
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent'
into tracing/core
Conflicts:
include/linux/ftrace.h
commit 345077cd98ff5532b2d1158013c3fec7b1ae85ec
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Thu Dec 18 18:09:21 2008 -0800
x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
Impact: fix wrong cache sharing detection on platforms supporting > 8 bit
apicid's
In the presence of extended topology eumeration leaf 0xb provided
by cpuid, 32bit extended initial_apicid in cpuinfo_x86 struct will be
updated by detect_extended_topology(). At this instance, we should also
reinit the apicid (which could also potentially be extended to 32bit).
With out this there will potentially be duplicate apicid's populated in the
per cpu's cpuinfo_x86 struct, resulting in wrong cache sharing topology etc
detected by init_intel_cacheinfo().
Reported-by: Dimitri Sivanich <sivanich@xxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Acked-by: Dimitri Sivanich <sivanich@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
commit cae51176c1082ecb59706056910f8a217d433981
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 08:36:53 2008 +0100
ALSA: split HD-audio model list to HD-Audio-Models.txt
Split the list of model option values to a separate file,
HD-Audio-Models.txt, from ALSA-Configuration.txt.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 335b986be79122b7323e09727e14c6a02bcf7746
Merge: 0ff555192a8d20385d49d1c420e2e8d409b3c0da
132bb7c0efe82fc976b06d557f5d63536cb9fdaa
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 08:25:46 2008 +0100
Merge branch 'topic/hda-doc' into topic/hda
commit 0ff555192a8d20385d49d1c420e2e8d409b3c0da
Merge: 3218c178b41b420cb7e0d120c7a137a3969242e5
9e43f0de690211cf7153b5f3ec251bc315647ada
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 19 08:22:57 2008 +0100
Merge branch 'fix/hda' into topic/hda
commit c94cb314503a69492bf4455dce4f6d300cff0851
Author: Oliver Neukum <oneukum@xxxxxxx>
Date: Thu Dec 18 23:00:59 2008 -0800
net: prepare usb net drivers for addition of status as a parameter
USB is going to switch the signature of the callbacks to
void callback(struct urb *urb, int status)
This patch will ease the transition.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ab5024ab23b78c86a0a1425defcdde48710fe449
Author: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Date: Thu Dec 18 22:59:32 2008 -0800
net: ppp_generic - use DEFINE_IDR for static initialization
We could use DEFINE_IDR for statically allocated idr
that allow us to save a few lines of code.
And spell fix.
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a109a5b916bc180e14fad0d1e9c37a08c85652c0
Author: Karen Xie <kxie@xxxxxxxxxxx>
Date: Thu Dec 18 22:56:20 2008 -0800
cxgb3: manage private iSCSI IP address
The accelerated iSCSI traffic could use a private IP address unknown to the
OS:
- The IP address is required in both drivers to manage ARP requests and
connection set up.
- Added an control call to retrieve the ip address.
- Reply to ARP requests dedicated to the private IP address.
Signed-off-by: Divy Le Ray <divy@xxxxxxxxxxx>
Signed-off-by: Karen Xie <kxie@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 221b3d60cbb2740ec7d46a4f1ea6d3318a112e51
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Thu Dec 18 08:23:35 2008 +0000
ucc_geth: Remove UGETH_FILTERING dead code
The code appears to be dead: nobody call these functions, plus build
breaks when UGETH_FILTERING is enabled:
ucc_geth.c:1848: warning: 'struct enet_addr' declared inside parameter list
ucc_geth.c:1848: warning: its scope is only this definition or declaration,
which is probably not what you want
ucc_geth.c: In function 'ugeth_82xx_filtering_get_match_addr_in_hash':
ucc_geth.c:1856: error: dereferencing pointer to incomplete type
ucc_geth.c:1874: error: dereferencing pointer to incomplete type
ucc_geth.c:1877: warning: return from incompatible pointer type
ucc_geth.c: At top level:
ucc_geth.c:1885: warning: 'struct enet_addr' declared inside parameter list
ucc_geth.c: In function 'ugeth_82xx_filtering_add_addr_in_hash':
ucc_geth.c:1894: error: dereferencing pointer to incomplete type
ucc_geth.c:1909: warning: passing argument 2 of
'ugeth_82xx_filtering_get_match_addr_in_hash' from incompatible pointer type
ucc_geth.c:1909: warning: assignment from incompatible pointer type
ucc_geth.c:1918: error: dereferencing pointer to incomplete type
ucc_geth.c: At top level:
ucc_geth.c:1928: warning: 'struct enet_addr' declared inside parameter list
ucc_geth.c: In function 'ugeth_82xx_filtering_clear_addr_in_hash':
ucc_geth.c:1947: warning: passing argument 2 of
'ugeth_82xx_filtering_get_match_addr_in_hash' from incompatible pointer type
ucc_geth.c:1947: warning: assignment from incompatible pointer type
ucc_geth.c:1954: error: dereferencing pointer to incomplete type
ucc_geth.c: At top level:
ucc_geth.c:2060: warning: 'struct enet_addr' declared inside parameter list
ucc_geth.c: In function 'ugeth_82xx_filtering_add_addr_in_paddr':
ucc_geth.c:2064: error: dereferencing pointer to incomplete type
ucc_geth.c:2073: error: dereferencing pointer to incomplete type
ucc_geth.c:2075: warning: passing argument 2 of 'hw_add_addr_in_paddr' from
incompatible pointer type
make[2]: *** [ucc_geth.o] Error 1
The code is there since the driver was merged, and nobody seem to be
interested in fixing or actually using it. If we ever want the
filtering support, we can always revert the patch and fix it, but so
far it just draws reader's attention.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3e73fc9a12679a546284d597c1f19165792d0b83
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Thu Dec 18 08:23:33 2008 +0000
ucc_geth: Fix IO memory (un)mapping code
The driver doesn't check ioremap() return value, and doesn't free the
remapped memory.
This patch fixes it.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ba574696a34eb518979e742b35ccd30dec284583
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Thu Dec 18 08:23:31 2008 +0000
ucc_geth: Cleanup repetitive ucc_geth_memclean() calls
No need to call ucc_geth_memclean() so many times, just check for
errors in ucc_geth_open(), and call ucc_geth_stop() in case of errors.
The ucc_geth_stop() may be called anytime and will do the right thing.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 67c2fb8ff0eda3cee95954a1dd245c3ce1a10486
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Thu Dec 18 08:23:29 2008 +0000
ucc_geth: Fix IRQ freeing code in ucc_geth_open()
open() routine calls stop() in case of errors, the function will try
to free the requested IRQ. But we don't know if it was actually
requested, so the code might issue bogus free_irq(0, dev) call.
Fix this by rearranging the code so that now request_irq() is the last
call in the open() routine, and move free_irq() into the close().
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1762a29ae5ebdd974eb2ba0c36b56ab6f7a9c16d
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Thu Dec 18 08:23:26 2008 +0000
ucc_geth: Fix TX watchdog timeout handling
The timeout handling code is currently broken in several ways:
- It calls stop() (which frees all the memory and IRQ), and then
calls startup() (which won't re-request IRQ, neither it will
re-init the Fast UCC structure).
- It calls these routines from the softirq context, which is wrong,
since stop() calls free_irq() (which might sleep) and startup()
allocates things with GFP_KERNEL.
- It won't soft-reset the PHY. We need the PHY reset for at least
MPC8360E-MDS boards with Marvell 88E1111 PHY, the PHY won't recover
from timeouts w/o the reset.
So the patch fixes these problems by implementing the workqueue for the
timeout handling, and there we fully re-open the device via close() and
open() calls. The close/open paths do the right things, and I can see
that the driver actually survive the timeouts.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b3431c647662a3647f3500a12ec85d65e3622759
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Thu Dec 18 08:23:22 2008 +0000
ucc_geth: Fix endless loop in stop_{tx,rx} routines
Currently the routines wait for the various bits w/o an assumption that
bits may never get set. When timeouts happen I see that these bits never
get set and so the routines hang the kernel.
With this patch we'll wait the graceful stop for 100 ms, and then will
simply exit. There is nothing* we can do about that, but it's OK since
we'll do full reset later.
* Well, actually, there is also not-graceful variant for the TX stop,
but specs says that we never should use it.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6086ebca13ddc9cfaaa25248ba8ebef35103fb74
Author: Matt Mackall <mpm@xxxxxxxxxxx>
Date: Thu Dec 18 19:54:22 2008 -0800
tcp: Stop scaring users with "treason uncloaked!"
The original message was unhelpful and extremely alarming to our poor
users, despite its charm. Make it less frightening.
Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e98def1f71fa0a6a37e12a56eb52ce5ed9e2e800
Author: Jesper Dangaard Brouer <hawk@xxxxxxx>
Date: Thu Dec 18 19:51:56 2008 -0800
NIU: Implement discard counters, optimize
Optimize the lightly loaded case, by only synchronizing discards stats
when qlen > 10 indicate potential for drops.
Notice Robert Olsson might disagree with this patch.
Signed-off-by: Jesper Dangaard Brouer <hawk@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d231776fda4a1ed754298720c5fbc29eb34f130c
Author: Jesper Dangaard Brouer <hawk@xxxxxxx>
Date: Thu Dec 18 19:51:26 2008 -0800
NIU: Implement discard counters, info/debug statements.
Discard packet counter debug statements that can be turned on
at runtime by users to assist debugging of the driver code.
Signed-off-by: Jesper Dangaard Brouer <hawk@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b8a606b871d37e03b92be1bd3deedeee97ea4f13
Author: Jesper Dangaard Brouer <hawk@xxxxxxx>
Date: Thu Dec 18 19:50:49 2008 -0800
NIU: Implement discard counters
Implementing discard counters for the NIU driver turned out to be more
complicated than first assumed.
The discard counters for the NIU neptune chip are only 16-bit (even
though this is a 64-bit chip). These 16-bit counters can overflow
quickly, especially considering this is a 10Gbit/s ethernet card.
The overflow indication bit is, unfortunatly, not usable as the
counter value does not wrap, but remains at max value 0xFFFF.
Resulting in lost counts until the counter is reset.
The read and reset scheme also poses a problem. Both in theory and in
practice counters can be lost in between reading nr64() and clearing
the counter nw64(). For this reason, the number of counter clearings
nw64() is limited/reduced. On the fast-path the counters are only
syncronized once it exceeds 0x7FFF. When read by userspace, its
syncronized fully.
Signed-off-by: Jesper Dangaard Brouer <hawk@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5664dd5561850df580414783cf3c8e0aa834c62e
Author: Baruch Siach <baruch@xxxxxxxxxx>
Date: Thu Dec 18 19:39:14 2008 -0800
enc28j60: reduce the number of spi transfers in enc28j60_set_bank()
A major source of overhead in the enc28j60 driver is the SPI transfers. Each
SPI transfer entails two kernel thread context switches. One major source of
SPI transfers is the enc28j60_set_bank() functions which runs before every
register access. This patch reduces the number of SPI transfers that
enc28j60_set_bank() performs in two ways:
1. removes unnecessary bank switch for the registers that are present in
all
banks
2. when switching from banks 0 or 3 to banks 1 or 2 (i.e. only one bit
changes) enc28j60_set_bank() does only one SPI transfer instead of two
According to my tests these changes reduce the number of SPI transfers in
about 25%.
Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b88a2a22c6670c31586d1a716255eae4c320b363
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Thu Dec 18 19:36:46 2008 -0800
netdevice zd1201: Use after free
| commit 3d29b0c33d431ecc69ec778f8c236d382f59a85f
| Author: John W. Linville <linville@xxxxxxxxxxxxx>
| Date: Fri Oct 31 14:13:12 2008 -0400
|
| netdevice zd1201: Convert directly reference of netdev->priv to
netdev_priv()
|
| We have some reasons to kill netdev->priv:
| 1. netdev->priv is equal to netdev_priv().
| 2. netdev_priv() wraps the calculation of netdev->priv's offset,
obviously
| netdev_priv() is more flexible than netdev->priv.
| But we cann't kill netdev->priv, because so many drivers reference to
it
| directly.
|
| OK, becasue Dave S. Miller said, "every direct netdev->priv usage is
a bug",
| and I want to kill netdev->priv later, I decided to convert all the
direct
| reference of netdev->priv first.
|
| (Original patch posted by Wang Chen <wangchen@xxxxxxxxxxxxxx> w/ above
| changelog but using dev->ml_priv. That doesn't seem appropriate
| to me for this driver, so I've revamped it to use netdev_priv()
| instead. -- JWL)
This commit changed the allocation of netdev, but didn't change
the free method of it.
This causes "zd" be used after the memory, which is pointed by "zd", being
freed by free_netdev().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3de77cf23e9a19b9fc28e3b29371308325428c39
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 18 19:23:56 2008 -0800
Revert "xfrm: Accept ESP packets regardless of UDP encapsulation mode"
This reverts commit e061b165c7f4ec5e2e160d990b49011b5b6e5c6a.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 739840d529eb7505d3cbfe9d468bf1440c9a8e27
Author: James Chapman <jchapman@xxxxxxxxxxx>
Date: Wed Dec 17 12:02:16 2008 +0000
ppp: fix segfaults introduced by netdev_priv changes
This patch fixes a segfault in ppp_shutdown_interface() and
ppp_destroy_interface() when a PPP connection is closed. I bisected
the problem to the following commit:
commit c8019bf3aff653cceb64f66489fc299ee5957b57
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Thu Nov 20 04:24:17 2008 -0800
netdevice ppp: Convert directly reference of netdev->priv
1. Use netdev_priv(dev) to replace dev->priv.
2. Alloc netdev's private data by alloc_netdev().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
The original ppp_generic code treated the netdev and struct ppp as
independent data structures which were freed separately. In moving the
ppp struct into the netdev, it is now possible for the private data to
be freed before the call to ppp_shutdown_interface(), which is bad.
The kfree(ppp) in ppp_destroy_interface() is also wrong; presumably
ppp hasn't worked since the above commit.
The following patch fixes both problems.
Signed-off-by: James Chapman <jchapman@xxxxxxxxxxx>
Reviewed-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1b08534e562dae7b084326f8aa8cc12a4c1b6593
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 18 19:35:10 2008 -0800
net: Fix module refcount leak in kernel_accept()
The kernel_accept() does not hold the module refcount of
newsock->ops->owner,
so we need __module_get(newsock->ops->owner) code after call kernel_accept()
by hand.
In sunrpc, the module refcount is missing to hold. So this cause kernel
panic.
Used following script to reproduct:
while [ 1 ];
do
mount -t nfs4 192.168.0.19:/ /mnt
touch /mnt/file
umount /mnt
lsmod | grep ipv6
done
This patch fixed the problem by add __module_get(newsock->ops->owner) to
kernel_accept(). So we do not need to used __module_get(newsock->ops->owner)
in every place when used kernel_accept().
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f34a10bd9f8cc95ebdc69a079db195636b2e22e0
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 19 01:36:14 2008 +0100
x86: fix warning in arch/x86/kernel/microcode_amd.c
this warning:
arch/x86/kernel/microcode_amd.c: In function â??apply_microcode_amdâ??:
arch/x86/kernel/microcode_amd.c:163: warning: cast from pointer to
integer of different size
arch/x86/kernel/microcode_amd.c:163: warning: cast from pointer to
integer of different size
triggers because we want to pass the address to the microcode MSR,
which is 64-bit even on 32-bit. Cast it explicitly to express this.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c71dd42db2c6f1637b92502a214587431c1a6ad2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 19 01:09:51 2008 +0100
tracing: fix warnings in kernel/trace/trace_sched_switch.c
these warnings:
kernel/trace/trace_sched_switch.c: In function
â??tracing_sched_registerâ??:
kernel/trace/trace_sched_switch.c:96: warning: passing argument 1 of
â??register_trace_sched_wakeup_newâ?? from incompatible pointer type
kernel/trace/trace_sched_switch.c:112: warning: passing argument 1 of
â??unregister_trace_sched_wakeup_newâ?? from incompatible pointer type
kernel/trace/trace_sched_switch.c: In function
â??tracing_sched_unregisterâ??:
kernel/trace/trace_sched_switch.c:121: warning: passing argument 1 of
â??unregister_trace_sched_wakeup_newâ?? from incompatible pointer type
Trigger because sched_wakeup_new tracepoints need the same trace
signature as sched_wakeup - which was changed recently.
Fix it.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3bddb9a3246f6df5cf3b7655cb541ac10203bb71
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 19 01:03:29 2008 +0100
tracing: fix warning in kernel/trace/trace.c
this warning:
kernel/trace/trace.c: In function â??print_lat_fmtâ??:
kernel/trace/trace.c:1826: warning: unused variable â??stateâ??
Triggers because 'state' has become unused - remove it.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9f221495997d180df51ce4d8296669445dd3e7b3
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Thu Dec 18 14:47:37 2008 -0800
x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
Impact: cleanup
Remove struct sigfram32 and rt_sigframe32 because there is no user.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 8869a2e5d3a66d5b63b948052d60cd13ede8b735
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Thu Dec 18 14:46:52 2008 -0800
x86: asm-offset_64: use rt_sigframe_ia32
Impact: cleanup
Use rt_sigframe_ia32 instead of rt_sigframe32.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit b2fa739c06931d167b6d2aa7b514ab7f30d04dc0
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Thu Dec 18 14:43:34 2008 -0800
x86: sigframe.h: include headers for dependency
Impact: cleanup
Include following headers for dependency.
asm/sigcontext.h
asm/siginfo.h
asm/ucontext.h
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit d1769d5475176124af04fa69848b022c98c4bc37
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Fri Dec 19 00:03:56 2008 +0530
x86: traps.c declare functions before they get used
Impact: cleanup
In asm/traps.h :-
do_double_fault : added under X86_64
sync_regs : added under X86_64
math_error : moved out from X86_32 as it is common for both 32 and 64 bit
math_emulate : moved from X86_32 as it is common for both 32 and 64 bit
smp_thermal_interrupt : added under X86_64
mce_threshold_interrupt : added under X86_64
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a2ced6e173e0c93870f79856e97825f4e180891e
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:33 2008 -0800
x86: PAT: update documentation to cover pgprot and remap_pfn related
changes - v3
Impact: Documentation only.
Add documentation related to pgprot_* change.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 2520bd3123c00272f818a176c92d03c7d0a113d6
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:32 2008 -0800
x86: PAT: add pgprot_writecombine() interface for drivers - v3
Impact: New mm functionality.
Add pgprot_writecombine. pgprot_writecombine will be aliased to
pgprot_noncached when not supported by the architecture.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 8a7b12f70fb135a1b1d865687de3edcdc780f6d1
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:31 2008 -0800
x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
Impact: mm behavior change.
Make pgprot_noncached uc_minus instead of strong UC. This will make
pgprot_noncached to be in line with ioremap_nocache() and all the other
APIs that map page uc_minus on uc request.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 5899329b19100c0b82dc78e9b21ed8b920c9ffb3
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:30 2008 -0800
x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
Impact: New mm functionality.
Hookup remap_pfn_range and vm_insert_pfn and corresponding copy and free
routines with reserve and free tracking.
reserve and free here only takes care of non RAM region mapping. For RAM
region, driver should use set_memory_[uc|wc|wb] to set the cache type and
then setup the mapping for user pte. We can bypass below
reserve/free in that case.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 2ab640379a0ab4cef746ced1d7e04a0941774bcb
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:29 2008 -0800
x86: PAT: hooks in generic vm code to help archs to track pfnmap regions -
v3
Impact: Introduces new hooks, which are currently null.
Introduce generic hooks in remap_pfn_range and vm_insert_pfn and
corresponding copy and free routines with reserve and free tracking.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit e121e418441525b5636321fe03d16f0193ad218e
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:28 2008 -0800
x86: PAT: add follow_pfnmp_pte routine to help tracking pfnmap pages - v3
Impact: New currently unused interface.
Add a generic interface to follow pfn in a pfnmap vma range. This is used by
one of the subsequent x86 PAT related patch to keep track of memory types
for vma regions across vma copy and free.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 3c8bb73ace6249bd089b70c941440441940e3365
Author: venkatesh.pallipadi@xxxxxxxxx <venkatesh.pallipadi@xxxxxxxxx>
Date: Thu Dec 18 11:41:27 2008 -0800
x86: PAT: store vm_pgoff for all linear_over_vma_region mappings - v3
Impact: Code transformation, new functions added should have no effect.
Drivers use mmap followed by pgprot_* and remap_pfn_range or vm_insert_pfn,
in order to export reserved memory to userspace. Currently, such mappings
are
not tracked and hence not kept consistent with other mappings (/dev/mem,
pci resource, ioremap) for the sme memory, that may exist in the system.
The following patchset adds x86 PAT attribute tracking and untracking for
pfnmap related APIs.
First three patches in the patchset are changing the generic mm code to fit
in this tracking. Last four patches are x86 specific to make things work
with x86 PAT code. The patchset aso introduces pgprot_writecombine
interface,
which gives writecombine mapping when enabled, falling back to
pgprot_noncached otherwise.
This patch:
While working on x86 PAT, we faced some hurdles with trackking
remap_pfn_range() regions, as we do not have any information to say
whether that PFNMAP mapping is linear for the entire vma range or
it is smaller granularity regions within the vma.
A simple solution to this is to use vm_pgoff as an indicator for
linear mapping over the vma region. Currently, remap_pfn_range
only sets vm_pgoff for COW mappings. Below patch changes the
logic and sets the vm_pgoff irrespective of COW. This will still not
be enough for the case where pfn is zero (vma region mapped to
physical address zero). But, for all the other cases, we can look at
pfnmap VMAs and say whether the mappng is for the entire vma region
or not.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit f0bc2202e0373eb8e9b1ddbec930e2e681357db8
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Wed Dec 17 23:20:05 2008 +0530
x86: process.c declare c1e_remove_cpu before they get used
Impact: cleanup, avoid sparse warning
Included asm/idle.h for c1e_remove_cpu() declaration. Fixes this
sparse warning:
CHECK arch/x86/kernel/process.c
arch/x86/kernel/process.c:284:6: warning: symbol 'c1e_remove_cpu' was not
declared. Should it be static?
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5c2628e8b4f670d0954053444289e2b018be957a
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Thu Dec 18 09:18:35 2008 -0800
x86: sigframe.h: add guard macro
Impact: cleanup
Add missing guard macro _ASM_X86_SIGFRAME_H.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f269b07e862c395d6981ab2c05d6bc34b0249e90
Author: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Date: Thu Dec 18 18:35:06 2008 +0100
x86: revert CONFIG_RELOCATABLE=y defconfig change
This commit:
commit 5cb04df8d3f03e37a19f2502591a84156be71772
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Sun May 4 19:49:04 2008 +0200
x86: defconfig updates
changed CONFIG_RELOCATABLE from n to y, which may lead to a mismatch
between the vmlinux debug information and the runtime location of the
kernel, even when the bootloader does not relocate the kernel.
Revert the specific change. Works for me with GRUB and qemu.
Reference: http://lkml.org/lkml/2008/11/25/243
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 179efcb47d5a5dd34a45be3f0eca4bffa717c6b4
Author: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Date: Tue Dec 16 12:33:43 2008 +0100
kbuild: add headerdep used to detect inclusion cycles in header files
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 40aa4a30d0fd075fb934de4ee8163056827052ab
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 16 10:15:12 2008 +0000
ASoC: Add WM8350 AudioPlus codec driver
The WM8350 is an integrated audio and power management subsystem which
provides a single-chip solution for portable audio and multimedia systems.
The integrated audio CODEC provides all the necessary functions for
high-quality stereo recording and playback. Programmable on-chip
amplifiers allow for the direct connection of headphones and microphones
with a minimum of external components. A programmable low-noise bias
voltage is available to feed one or more electret microphones.
Additional audio features include programmable high-pass filter in the
ADC input path.
This driver was originally written by Liam Girdwood with further updates
from me.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit b8b33cb5608a3bb1b072548dc89159ef614096ab
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 11:19:30 2008 +0000
ASoC: Complain if we fail to create DAPM controls
This should never happen and it's helpful to identify the specific control
that failed when it does happen.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 0b34a3d03e2fa615a786027b1ef4cbbd8c807f2c
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 16 14:44:48 2008 +0000
ASoC: Ease merge difficulties from new architectures
Rather than listing lots of architectures per line in Kconfig and
Makefile, causing merge conflicts all the time, have one per line
in alphabetical order.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 9c2c48020ec0dd6ecd27e5a1298f73b40d85a595
Author: Ken Chen <kenchen@xxxxxxxxxx>
Date: Tue Dec 16 23:41:22 2008 -0800
schedstat: consolidate per-task cpu runtime stats
Impact: simplify code
When we turn on CONFIG_SCHEDSTATS, per-task cpu runtime is accumulated
twice. Once in task->se.sum_exec_runtime and once in sched_info.cpu_time.
These two stats are exactly the same.
Given that task->se.sum_exec_runtime is always accumulated by the core
scheduler, sched_info can reuse that data instead of duplicate the
accounting.
Signed-off-by: Ken Chen <kenchen@xxxxxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6d102bc68f3dd2ae0e305b09170b1751aa67baeb
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Date: Wed Dec 17 17:48:23 2008 +0800
tracing/ring-buffer: remove unused ring_buffer size
Impact: remove dead code
struct ring_buffer.size is not set after ring_buffer is initialized
or resized. it is always 0.
we can use "buffer->pages * PAGE_SIZE" to get ring_buffer's size
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7c9c160c54fc545efc23881344593868e5f717bd
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Wed Dec 17 23:18:52 2008 +0530
x86: tls.c declare sys_set_thread_area and sys_get_thread_area before they
get used
Impact: cleanup
In asm/syscalls.h move out sys_set_thread_area() and sys_get_thread_area()
as they are common for both 32 and 64 bit.
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 57a37505d19f4dfeee26f0fd7ea38ed6f1d10cbe
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Wed Dec 17 23:17:21 2008 +0530
x86: time_64.c timer_interrupt() should be static
Impact: cleanup, reduce kernel size a bit
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3d9101e92529e1ff6014f95a69afc82f37b9b13a
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Wed Dec 17 22:34:13 2008 +0100
trace: fix task state printout
Impact: fix occasionally incorrect trace output
The tracing code has interesting varieties of printing out task state.
Unfortunalely only one of the instances is correct as it copies the
code from sched.c:sched_show_task(). The others are plain wrong as
they treatthe bitfield as an integer offset into the character
array. Also the size check of the character array is wrong as it
includes the trailing \0.
Use a common state decoder inline which does the Right Thing.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ea3a6d6d60b2504c573fe3415f6617e8310c0236
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 17 15:05:36 2008 -0500
ftrace: add not to regex on filtering functions
Impact: enhancement
Ingo Molnar has asked about a way to remove items from the filter
lists. Currently, you can only add or replace items. The way
items are added to the list is through opening one of the list
files (set_ftrace_filter or set_ftrace_notrace) via append.
If the file is opened for truncate, the list is cleared.
echo spin_lock > /debug/tracing/set_ftrace_filter
The above will replace the list with only spin_lock
echo spin_lock >> /debug/tracing/set_ftrace_filter
The above will add spin_lock to the list.
Now this patch adds:
echo '!spin_lock' >> /debug/tracing/set_ftrace_filter
This will remove spin_lock from the list.
The limited glob features of these lists also can be notted.
echo '!spin_*' >> /debug/tracing/set_ftrace_filter
This will remove all functions that start with 'spin_'
Note:
echo '!spin_*' > /debug/tracing/set_ftrace_filter
will simply clear out the list (notice the '>' instead of '>>')
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e05a43b744fb9518cbf8539a7ef33164ac60a70f
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 17 09:43:00 2008 -0500
trace: better use of stack_trace_enabled for boot up code
Impact: clean up
Andrew Morton suggested to use the stack_tracer_enabled variable
to decide whether or not to start stack tracing on bootup.
This lets us remove the start_stack_trace variable.
Reported-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f38f1d2aa5a3520cf05da7cd6bd12fe2b0c509b7
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 16 23:06:40 2008 -0500
trace: add a way to enable or disable the stack tracer
Impact: enhancement to stack tracer
The stack tracer currently is either on when configured in or
off when it is not. It can not be disabled when it is configured on.
(besides disabling the function tracer that it uses)
This patch adds a way to enable or disable the stack tracer at
run time. It defaults off on bootup, but a kernel parameter 'stacktrace'
has been added to enable it on bootup.
A new sysctl has been added "kernel.stack_tracer_enabled" to let
the user enable or disable the stack tracer at run time.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 40874491f9e9a4cb08eaf663dbe018bf5671975a
Merge: d680fe44775ed17a80035462d9898f5e77bfd7dd
d072c25f531c6513994960401d2c7f059434c0d2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 18 12:51:05 2008 +0100
Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into
tracing/core
commit 1f04128a3db7c0f0e8b5d25323eba70ac342f47f
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 18 12:17:55 2008 +0100
ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule()
Replace all tasklet_hi_schedule() callers with the normal
tasklet_schedule(). The former often causes troubles with
RT-kernels, and has actually no merit.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit d98f9d84422c393103dc7569dc8444bac628f7ac
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Wed Dec 17 18:52:45 2008 -0800
x86: ia32_signal: use sigframe.h
Impact: cleanup
Use arch/x86/include/asm/sigframe.h instead of defining redundant
structures.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3b0d29ee1c73b6b90bfddd10f7b8e86632b6b694
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Wed Dec 17 18:51:46 2008 -0800
x86: ia32_signal: rename struct sigframe and rt_sigframe
Impact: cleanup, prepare to include sigframe.h
Rename struct sigframe to struct sigframe_ia32 and struct rt_sigframe to
struct rt_sigframe_ia32.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c85c2ff877c9305f801f7d5b9e6382cb05a03d45
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Wed Dec 17 18:51:08 2008 -0800
x86: signal: prepare to include from ia32_signal.c
Impact: cleanup, prepare to use from ia32_signal.c
Make struct sigframe_ia32 and rt_sigframe_ia32 visible to ia32_signal.c.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 41af86fad3c40646b9748279e3862781e937a5d2
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Wed Dec 17 18:50:32 2008 -0800
x86: signal: move sigframe.h to arch/x86/include/asm
Impact: cleanup, move header file
Move arch/x86/kernel/sigframe.h to arch/x86/include/asm/sigframe.h.
It will be used in arch/x86/ia32/ia32_signal.c.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a5c56eb36f999ae0ecac278e51fd1cf8feb16c2f
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Wed Dec 17 18:49:55 2008 -0800
x86: signal: rename sigframe and rt_sigframe on 32-bit
Impact: cleanup, prepare to move sigframe.h
On 32-bit, rename struct sigrame to struct sigframe_ia32, struct rt_sigframe
to struct rt_sigframe_ia32 and several structures.
And add helper macros to access the above data in arch/x86/kernel/signal.c.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f5223763a664da16771211f9d293e18cb242b246
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Wed Dec 17 18:47:17 2008 -0800
x86: signal: move ia32 func declarations into arch/x86/kernel/signal.c
Impact: cleanup
Move declarations of ia32_setup_rt_frame() and ia32_setup_frame() into
arch/x86/kernel/signal.c.
This is for future use of sigframe.h.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3218c178b41b420cb7e0d120c7a137a3969242e5
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 18 09:17:56 2008 +0100
ALSA: hda - Remove duplicated strings from codec name
Remove codec vendor names from the codec name strings.
The vendor name is already given from the vendor name table, so
displayed doubly.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 74c611334ff131f2b87c7634314bde9e7fd98653
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 18 09:11:33 2008 +0100
ALSA: hda - Add Intel vendor id string
Added Intel codec vendor id string (0x8086).
Also fixed Intel-HDMI codec name strings, too.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 49ad9599d42da4787d5b3a19263440e0fcd4d1fc
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 17 22:11:38 2008 -0800
Revert "net: release skb->dst in sock_queue_rcv_skb()"
This reverts commit 70355602879229c6f8bd694ec9c0814222bc4936.
As pointed out by Mark McLoughlin IP_PKTINFO cmsg data is one
post-queueing user, so this optimization is not valid right
now.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3b5b35d02264580950d1e1565431b99d97c20ded
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:13:53 2008 -0800
bonding: use port_params in __update_lacpdu_from_port
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3c52065fbbf3bd11776d63d43e18d0fd285b02e2
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:13:27 2008 -0800
bonding: use port_params in __update_default_selected()
I also removed some of the unneeded braces in the if condition to
improve readability and a little bit of reformatting.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ce6a49ad401d78ff1f66e2a55cf445d0f45d8146
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:13:07 2008 -0800
bonding: use port_params in __update_selected()
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a6ae186b9a950f4d0467cb9c3661965f442176de
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:12:40 2008 -0800
bonding: remove various function declarations
They are all defined before used, it's therefore ok to remove
them.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c7e703d01ecfb8db1557090938f0eabb51ebe3a1
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:12:07 2008 -0800
bonding: init port_params from template
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5eefd1adceb49cada224a383f4a36c2f27fe4968
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:08:46 2008 -0800
bonding: use plain memcpy in __record_default()
Also remove the pointless comment at the top.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b99d6ba96d814dab06671029948f22995d603d7b
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:08:14 2008 -0800
bonding: use port_params in __record_pdu()
It helps in maintaining the various partner information values from
the LACPDU. It also removes the pointless comment at the top.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1055c9aba3b6850245fe3bbb533d4747e7f904bf
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:07:38 2008 -0800
bonding: introduce and use port_params structure
It generally helps to handle those values in various places, using it
might make the code more readable and gives room for other improvements.
The IEEE standard talks about them as "parameter values".
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa3128199dbe07b5be3382de590c59216f91d3e3
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Dec 17 19:07:16 2008 -0800
bonding: improve elaborate port_state assignment
The previous code was just a funny way of assigning both values (they
are both of type u8).
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 42199884594bc336c9185441cbed99a9324dab34
Author: Andy Fleming <afleming@xxxxxxxxxxxxx>
Date: Wed Dec 17 16:52:30 2008 -0800
gianfar: Continue polling until both tx and rx are empty
gfar_poll would declare polling done once the rx queue was empty,
but the tx queue could still have packets left.
Stolen mostly from the e1000 driver.
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8c7396aebb68994c0519e438eecdf4d5fa9c7844
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Wed Dec 17 16:52:00 2008 -0800
gianfar: Merge Tx and Rx interrupt for scheduling clean up ring
No clean up function is executed in the interrupt context by this patch.
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Acked-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c50a5d9aedef5b0b289d07f6d73934d394e50b3f
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Wed Dec 17 16:51:32 2008 -0800
gianfar: Use interface name in interrupt name to distinguish the source.
Interface name (ex. eth0) is used as the prefix for the interrupt name,
with _rx, _tx, and _er appended to distinguish multiple interrupts on
the same interface.
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4669bc907488f5a3ee399ced132deb6165e489a3
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Wed Dec 17 16:51:04 2008 -0800
gianfar: Add Scatter Gather support
Scatter Gather support in gianfar driver to handle fragmented frames on
the transmit side.
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@xxxxxxxxxxxxx>
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8882d9a60028a9937e9c5652cfb80d4399ce5242
Author: Andy Fleming <afleming@xxxxxxxxxxxxx>
Date: Wed Dec 17 16:50:22 2008 -0800
gianfar: Fix packet drop when out of memory
The patch which fixed gianfar so it drops packets when it runs out
of memory left in the code which frees the skb when it drops packets.
Change the code so that we only free the skb if the new skb was successfully
created.
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a693722aec4ce26fb46c21cf4bf4422484a397a7
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Wed Dec 17 16:08:01 2008 -0800
dccp_diag: LISTEN sockets don't have CCIDs
And thus when we try to use 'ss -danemi' on these sockets that have no
ccid blocks (data collected using systemtap after I fixed the problem):
dccp_diag_get_info sk=0xffff8801220a3100,
dp->dccps_hc_rx_ccid=0x0000000000000000, dp->dccps_hc_tx_ccid=0x0000000000000000
We get an OOPS:
mica.ghostprotocols.net login: BUG: unable to handle kernel NULL pointer
dereferenc0
IP: [<ffffffffa0136082>] dccp_diag_get_info+0x82/0xc0 [dccp_diag]
PGD 12106f067 PUD 122488067 PMD 0
Oops: 0000 [#1] PREEMPT
Fix is trivial, and 'ss -d' is working again:
[root@mica ~]# ss -danemi
State Recv-Q Send-Q Local Address:Port Peer Address:Port
LISTEN 0 0 *:5001 *:*
ino:7288 sk:220a3100ffff8801
mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0
[root@mica ~]#
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c280266a326ccabeb64b6d69fa4fd21faf5bf354
Merge: eddce368f99b682683e09cf206eaa25131d40abe
55dac3a5553b13891f0ae4bbd11920619b5436d4
Author: Paul Mackerras <paulus@xxxxxxxxx>
Date: Thu Dec 18 11:06:12 2008 +1100
Merge branch 'linux-2.6' into next
commit 9732d523212060c44a4723332bdc5ee429eeabc3
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Wed Dec 17 15:49:09 2008 -0800
Phonet: USB CDC Phonet function for gadget framework
This implements the Nokia vendor-specific communication device class
function to exchange Phonet messages over USB. This function is already
found in the "PC suite" USB profile of (non-Linux) Nokia handsets.
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 893873f3965ae0173a9315534bec7628162d2243
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Wed Dec 17 15:48:50 2008 -0800
Phonet: get rid of deferred work on the transmission path
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit be677730a0ccb6bedced6f65f2ba8f57a3c607ba
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Wed Dec 17 15:48:31 2008 -0800
Phonet: use atomic for packet TX window
GPRS TX flow control won't need to lock the underlying socket anymore.
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 57c81fffc863fb4c1804bc963bcbfb82d736c6df
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Wed Dec 17 15:47:48 2008 -0800
Phonet: allocate separate ARP type for GPRS over a Phonet pipe
A separate xmit lock class supports GPRS over a Phonet pipe over a TUN
device (type ARPHRD_NONE).
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2d91d78b68606ff7ce52ea70e187dee7831aa2f6
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Wed Dec 17 15:47:29 2008 -0800
Phonet: allocate a non-Ethernet ARP type
Also leave some room for more 802.11 types.
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fc10af8e658936f7b2bddd077f7ddcbe1eddc066
Author: Oliver Hartkopp <oliver@xxxxxxxxxxxx>
Date: Wed Dec 17 15:37:55 2008 -0800
vcan: whitespace fixes
Signed-off-by: Oliver Hartkopp <oliver@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a67534a7824c7ef3c4c377f82e60fcaa137f9a2c
Author: Jiri Slaby <jirislaby@xxxxxxxxx>
Date: Wed Dec 10 09:09:27 2008 -0300
V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
Posting to linux-uvc-devel is restricted to members.
You can subscribe to the list at ...
MAINTAINERS | 2 +-
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7a95d267fb62cd6b80ef73be0592bbbe1dbd5df7
Author: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Date: Wed Dec 17 00:34:06 2008 -0800
net: ppp_generic - use idr technique instead of cardmaps
Use idr technique instead of own implemented cardmaps.
It saves us a number of lines and gives an ability
to use library functions.
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c0700f90e5300c63d01c70e157e75e4510dd2981
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 16 23:53:20 2008 -0800
bnx2x: Fix namespace collision with FLOW_CTRL_{TX,RX}
These are now defined in linux/mii.h and the bnx2x driver
defines different values which are shared with hardware
data structures.
So add a "BNX2X_" prefix to these macro names.
Based upon a report from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f6d52432a4bc6da5de2a0bbb350f735db3206aa5
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 16 23:45:02 2008 -0800
bnx2: Don't redefine FLOW_CTRL_{RX,TX}.
They are provided generically by linux/mii.h now.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1f2435e532bd64742c3f766b7d5c17cc9d0b8558
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Tue Dec 16 20:28:13 2008 -0800
bnx2: Update version to 1.9.0.
And fix the 5716S pci_device_id entry to point to the proper string.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4e1d0de95c55383f598516ebf82969260c18e4bd
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Tue Dec 16 20:27:45 2008 -0800
bnx2: Rename MSI-X vectors.
Change MSI-X vector names to "ethx-%d".
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit eddce368f99b682683e09cf206eaa25131d40abe
Merge: b53c7583e26746ef6f66c866841e10450150ed8e
cd85400a022335a92fa3c25827179a7ad5e02225
Author: Paul Mackerras <paulus@xxxxxxxxx>
Date: Wed Dec 17 11:01:43 2008 +1100
Merge branch 'next' of
master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into next
commit f40e0638237a2d3e2ce8bedf3af4b3c02cf6fff7
Author: Julia Lawall <julia@xxxxxxx>
Date: Tue Dec 16 15:43:29 2008 -0800
drivers/net/hamradio: Move a dereference below a NULL test
In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@
- T i = E->fld;
+ T i;
... when != E
when != i
if (E == NULL) S
+ i = E->fld;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f162e97d778ec29492be8eb9bbecb65be976b7c8
Author: Andy Fleming <afleming@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:39:48 2008 -0800
phylib: Remove unnecessary "reset" fixups in genphy_setup_forced
genphy_setup_forced hasn't actually reset the PHY for a long time,
but a comment to that effect remained in the code, so code continued
to act as if it *had* reset the PHY, and called the necessary fixup
functions to respond to a PHY reset. With no reset, those functions
are no longer needed, so we remove them.
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5a5efed4817ef931f648b118aeb9222e53122d2b
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:34:50 2008 -0800
gianfar: Make all BD status writes 32-bit
Whenever we want to update the status field in a BD, we usually want to
update the length field, too. By combining them into one 32-bit field, we
reduce the number of stores to memory shared with the controller, and we
eliminate the need for order-enforcement, as the length and "READY" bit are
now updated atomically at the same time.
Signed-off-by: Dai Haruki <Dai.Haruki@xxxxxxxxxxxxx>
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 31de198b4d2732028f4c5bff04b0103b1d8c1d8c
Author: Andy Fleming <afleming@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:33:40 2008 -0800
gianfar: Add macros for stepping through BDs
This code is based strongly on code from Dai Haruki
<Dai.Haruki@xxxxxxxxxxxxx>.
The gianfar Buffer Descriptors are arranged in a circular array, the end of
which is denoted by setting the "WRAP" bit in the descriptor. However, the
software knows the end of the ring because it knows how many descriptors are
there. Rather than check each descriptor for whether the WRAP bit is set,
use pointer math to determine where the next BD is. This is also useful for
when we want to look at BDs other than the very next one (for
Scatter-Gather).
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a22823e72a4821ce1d4a248fbd8f5a81795af339
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:32:11 2008 -0800
gianfar: Remove unused gfar_add_fcb() function parameter
- Also, use cacheable_memzero instead of memset for performance reasons.
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Acked-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2c2db48acb34735d8ef257f130c0c330c46c8f6a
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:31:15 2008 -0800
gianfar: Enable padding and Optimize the frame prepended bytes handling
The eTSEC can prepend up to 32 bytes to a received frame, usually for the
purpose of aligning the IP address to a word boundary, so this turns it on.
While we're in there, make the handling of the pre-frame bytes (padding and
Frame Control Block) cleaner.
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 77ecaf2d5a8bfd548eed3f05c1c2e6573d5de4ba
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:30:48 2008 -0800
gianfar: Fix VLAN HW feature related frame/buffer size calculation.
Optimize the VLAN checking logic as well.
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Acked-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 12dea57be552a291e93827baeffbb91e33f587a6
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:30:20 2008 -0800
gianfar: Fix eTSEC configuration procedure
Fix some bugs in the ethtool configuration functions:
* gfar_clean_rx_ring should not be called with interrupts disabled.
* Update last transmission time to avoid tx timeout.
* Delete redundant NETIF_F_IP_CSUM check in gfar_start_xmit
* Use netif_tx_lock_bh when reconfiguring the tx csum
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b46a8454cd304b5376ba00d3457a612720e47269
Author: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:29:52 2008 -0800
gianfar: Optimize interrupt coalescing configuration
Store the interrupt coalescing values in the form in which they will be
written to the interrupt coalescing registers. This puts a little overhead
into the ethtool configuration, and takes it out of the interrupt handler
Signed-off-by: Dai Haruki <dai.haruki@xxxxxxxxxxxxx>
Acked-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4
Author: Andy Fleming <afleming@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:29:15 2008 -0800
gianfar: Convert gianfar to an of_platform_driver
Does the same for the accompanying MDIO driver, and then modifies the TBI
configuration method. The old way used fields in einfo, which no longer
exists. The new way is to create an MDIO device-tree node for each instance
of gianfar, and create a tbi-handle property to associate ethernet
controllers
with the TBI PHYs they are connected to.
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d680fe44775ed17a80035462d9898f5e77bfd7dd
Author: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Date: Sat Dec 13 00:09:08 2008 +0300
x86: entry_64 - introduce FTRACE_ frame macro v2
Impact: clean up
Itroduce MCOUNT_SAVE/RESTORE_FRAME which allow us to
save a number of lines on source level.
Also fix a comment in ftrace.h.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 66896a85cf2890b6bbbc4c9ccdcd296600ffbf89
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Sat Dec 13 20:18:13 2008 +0100
tracing/ftrace: add the printk-msg-only option
Impact: display ftrace_printk messages "as is"
By default, ftrace_printk() messages find their output with some other
informations like pid, caller, ...
Sometimes a developer just want to have the ftrace_printk left "as is",
without
other information.
This is done by providing a default-off option called printk-msg-only.
To enable it, just do `echo printk-msg-only >
/debugfs/tracing/trace_options`
Before the patch:
<...>-2739 [000] 145.692153: __might_sleep: I'm an
ftrace_printk msg in __might_sleep
<...>-2739 [000] 145.692155: __might_sleep: I'm another
ftrace_printk msg in __might_sleep
After the patch and the printk-msg-only option enabled:
I'm an ftrace_printk msg in __might_sleep
I'm another ftrace_printk msg in __might_sleep
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2c2d7329d8afa9efa3ec24e19a53e7be9d14f242
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Tue Dec 16 22:08:58 2008 +0100
tracing/ftrace: use preempt_enable_no_resched_notrace in
ring_buffer_time_stamp()
Impact: prevent a trace recursion
After some tests with function graph tracer under x86-32, I saw some
recursions
caused by ring_buffer_time_stamp() that calls preempt_enable_no_notrace()
which
calls preempt_schedule() which is traced itself.
This patch re-enables preemption without rescheduling.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 257d938a0c17838c740eb68f0005b041444ac2c2
Author: Andy Fleming <afleming@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:25:45 2008 -0800
gianfar: Use gfar_halt to stop DMA in gfar_probe
gfar_halt does everything we want to do there, including disabling
TX/RX. It also doesn't unnecessarily enable DMA if it's already
stopped.
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5eeabf5150878018d7c7092042f3b681f5b554b5
Author: Sakari Ailus <sakari.ailus@xxxxxx>
Date: Tue Dec 16 15:24:05 2008 -0800
tlan: Remove broken support for big buffers
The big rx/tx buffer support is broken and unlikely to be very useful
as such. Remove it.
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 354ade9058687fdef8a612c7b298d4c51dae3da7
Merge: 9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b
bb5f133dbc4f04b6388715d364ae5865455166c2
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 16 15:23:54 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/enc28j60.c
commit 8bee3f0a662ad9c3d6bb705b0530a3b90f089c55
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Tue Dec 16 14:04:43 2008 -0800
x86: ia32_signal: use proper macro __USER32_DS
Impact: cleanup
Use __USER32_DS instead of __USER_DS in ia32_signal.c.
No impact, because __USER32_DS is defined __USER_DS.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d0b48ca189523b638d8674fa41e94d1950a17038
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Tue Dec 16 14:03:36 2008 -0800
x86: ia32_signal: use __put_user() instead of __copy_to_user()
Impact: cleanup
__put_user() can be used for constant size 8, like arch/x86/kernel/signal.c.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ae417bb487e3bb88dc862b83b4bf00d87ba67ec8
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Tue Dec 16 14:02:16 2008 -0800
x86: signal: use signal_fault() in sys_sigreturn()
Impact: cleanup
Call signal_fault() in error route of sys_sigreturn().
Change log level to KERN_EMERG if current is init.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c8182f0016fb65a721c4fbe487909a2d56178135
Author: Russ Anderson <rja@xxxxxxx>
Date: Fri Dec 12 11:07:00 2008 -0600
sgi-xp: xpc needs to pass the physical address, not virtual
Impact: fix crash
xpc needs to pass the physical address, not virtual.
Testing uncovered this problem. The virtual address happens to work
most of the time due to the way bios was masking off the node bits.
Passing the physical address makes it work all of the time.
Signed-off-by: Russ Anderson <rja@xxxxxxx>
Acked-by: Dean Nelson <dcn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 189f67c4408806563a1f061f5c8bf184a6658477
Author: Jack Steiner <steiner@xxxxxxx>
Date: Fri Dec 12 14:50:40 2008 -0600
x86: UV fix for global physical addresses
Impact: fix UV boot crash
This fixes a UV bug related to generating global memory addresses
on partitioned systems. Partition systems do not have physical memory
at address 0. Instead, a chunk of high memory is remapped by the chipset
so that it appears to be at address 0. This remapping is INVISIBLE to most
of the OS. The only OS functions that need to be aware of the remaping are
functions that directly interface to the chipset. The GRU is one example.
Also, delete a couple of unused macros related to global memory addresses.
Signed-off-by: Jack Steiner <steiner@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c15cb37cc4e9809624411333b96109ddf770e29c
Merge: 77be80e437fec44f8b7a620314b7d7b605b8d93b
8b1fae4e4200388b64dd88065639413cb3f1051c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 22:53:53 2008 +0100
Merge commit 'v2.6.28-rc8' into x86/uv
commit fde9071167c4624281553b23232aa8b81e71c790
Author: Zachary Amsden <zach@xxxxxxxxxx>
Date: Fri Dec 12 11:26:35 2008 -0800
x86: clean up dead code in vmi_32.c
Impact: cleanup, remove dead debug code
I ran across some old debugging code in vmi paravirt-ops code that was
already dead, but still potentially useful. After reviewing recent
changes to the way kernel page tables are allocated and initialized, and
the lack of bugs caught by this debugging code, I've concluded it is now
totally useless to have around, and it's already been #if 0'd for quite
some time.
There's no rush to get this in mainline, but it's also totally harmless,
so I'll let the x86 maintainers decide where it should be tucked. I've
been out of the mainstream dev loop for a couple months, so apologies if
I haven't got any protocol changes in order.
Remove mummified remains found in vmi_32.c
Signed-off-by: Zachary Amsden <zach@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8ae936690972dfcad73d0dde1095b9f32af5ee95
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Fri Dec 12 15:52:26 2008 -0800
x86: hardirq: use inc_irq_stat() in non-unified functions
Impact: cleanup
Replace incrementing irq stat with inc_irq_stat() in non-unified functions.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e1286f2c686f5976e0424bb6195ece25e7a17607
Author: Philipp Kohlbecher <xt28@xxxxxx>
Date: Sun Dec 14 18:50:01 2008 +0100
x86: documentation fix regarding boot protocol
Impact: clarify documentation
Documentation/x86/boot.txt describes payload_offset as the offset
from the end of the real-mode code. In fact, it is more accurately
described as the offset from the beginning of the protected-mode
code, as (a) this is how it is actually calculated and (b) the padding
after the real-mode code is not included in the offset.
Signed-off-by: Philipp Kohlbecher <xt28@xxxxxx>
Acked-by: Ian Campbell <ijc@xxxxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 78f902ccc597d6ce3e8d1477d70f2d79e960ba7a
Merge: 9ee670fd87b7d69c8633b94c42aadcbbcb96f28e
8b1fae4e4200388b64dd88065639413cb3f1051c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 22:04:48 2008 +0100
Merge commit 'v2.6.28-rc8' into x86/doc
commit ecbf29cdb3990c83d90d0c4187c89fb2ce423367
Author: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Tue Dec 16 12:37:07 2008 -0800
xen: clean up asm/xen/hypervisor.h
Impact: cleanup
hypervisor.h had accumulated a lot of crud, including lots of spurious
#includes. Clean it all up, and go around fixing up everything else
accordingly.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 80f40ee4a07530cc3acbc239a9299ec47025825b
Author: Bharata B Rao <bharata@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 11:56:48 2008 +0530
sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
Impact: fix potential of rare crash
for_each_leaf_rt_rq() walks an RCU protected list (rq->leaf_rt_rq_list),
but doesn't use list_for_each_entry_rcu(). Fix this.
Signed-off-by: Bharata B Rao <bharata@xxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a9b43c7d9890066709609df849959009645c1a19
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Mon Dec 15 23:11:10 2008 +0530
x86: setup.c find_and_reserve_crashkernel should be static
Impact: cleanup, reduce kernel size a bit
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c0195b6da08c4ddd8c8ea830f6c3c40bc7f82071
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Mon Dec 15 22:26:30 2008 +0530
x86: ldt.c declare sys_modify_ldt before they get used
Impact: cleanup
In asm/syscalls.h moved out sys_modify_ldt from CONFIG_X86_32 as it is
common for both 32 and 64 bit.
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7b5b50f1be9e07714cfaa620d102c8daf3cdd814
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Mon Dec 15 22:24:48 2008 +0530
x86: signal.c declare do_notify_resume before they get used
Impact: cleanup
In asm/signal.h moved out do_notify_resume from __i386__ as it is common
for both 32 and 64 bit.
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
arch/x86/include/asm/signal.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit aab02f0ae20b8fe0fe891e9f107c6e392256ca01
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Mon Dec 15 22:23:54 2008 +0530
x86: process_64.c declare __switch_to() and sys_arch_prctl before they get
used
Impact: cleanup
In asm/system.h moved out __switch_to from CONFIG_X86_32 as it is common for
both 32 and 64 bit.
In asm/pctl.h defined sys_arch_prctl
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f63c2f248959366cd11bfa476f866737047cf663
Author: Tej <bewith.tej@xxxxxxxxx>
Date: Tue Dec 16 11:56:06 2008 -0800
xen: whitespace/checkpatch cleanup
Impact: cleanup
Signed-off-by: Tej <bewith.tej@xxxxxxxxx>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 40fb17152c50a69dc304dd632131c2f41281ce44
Author: Venki Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Date: Mon Nov 17 16:11:37 2008 -0800
x86: support always running TSC on Intel CPUs
Impact: reward non-stop TSCs with good TSC-based clocksources, etc.
Add support for CPUID_0x80000007_Bit8 on Intel CPUs as well. This bit means
that the TSC is invariant with C/P/T states and always runs at constant
frequency.
With Intel CPUs, we have 3 classes
* CPUs where TSC runs at constant rate and does not stop n C-states
* CPUs where TSC runs at constant rate, but will stop in deep C-states
* CPUs where TSC rate will vary based on P/T-states and TSC will stop in
deep
C-states.
To cover these 3, one feature bit (CONSTANT_TSC) is not enough. So, add a
second bit (NONSTOP_TSC). CONSTANT_TSC indicates that the TSC runs at
constant frequency irrespective of P/T-states, and NONSTOP_TSC indicates
that TSC does not stop in deep C-states.
CPUID_0x8000000_Bit8 indicates both these feature bit can be set.
We still have CONSTANT_TSC _set_ and NONSTOP_TSC _not_set_ on some older
Intel
CPUs, based on model checks. We can use TSC on such CPUs for time, as long
as
those CPUs do not support/enter deep C-states.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7e91a122b11bb250d08ab125afd2c232c87502e1
Merge: 1bda71282ded6a2e09a2db7c8884542fb46bfd4f
d4377974062122d6d9be0bbd8a910a0954714194
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 21:02:10 2008 +0100
Merge branch 'x86/cpufeature' into x86/tsc
Merge itto in x86/tsc because an upcoming patch relies on a new
cpuid bit defined in the x86/cpufeature branch.
commit d4377974062122d6d9be0bbd8a910a0954714194
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 20:59:24 2008 +0100
x86: support always running TSC on Intel CPUs, add cpufeature definition
Impact: add new synthetic-cpuid bit definition
add X86_FEATURE_NONSTOP_TSC to the cpufeature bits - this is in
preparation of Venki's always-running-TSC patch.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit dd7a5230cd651bfb119d222561c4032f30dd5659
Merge: 050dc6944b9ca2186f4729ab44e0da3743933941
8b1fae4e4200388b64dd88065639413cb3f1051c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 20:57:41 2008 +0100
Merge commit 'v2.6.28-rc8' into x86/cpufeature
commit df23cab563912ba43f7e9bc8ac517e5a2ddc9cd2
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:22:36 2008 +0100
x86: microcode_amd: modify log messages
Impact: change microcode printk content
Change log level and provide (at least I tried to;-) consistent, short,
meaningful content.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Cc: Dmitry Adamushko <dmitry.adamushko@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5549b94bc74c3e7edd44e0aeb7d9f773e82d2d20
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:21:30 2008 +0100
x86: microcode_amd: use 'packed' attribute for structs
Impact: cleanup
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 98415301ea2dd389539ab429bcfa9da07219eabc
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:20:21 2008 +0100
x86: microcode_amd: remove (wrong) chipset deivce ID checks
Impact: remove dead/incorrect code
Currently there is no chipset specific ucode. The checks are incorrect
anyway (e.g. pci device IDs are 16 bit and not 8 bit).
Thus I remove the stuff for the time being and will reintroduce it if
it's foreseeable that it is really needed.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6cc9b6d94b6fee23b0671970f67d297fa76b68b3
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:17:45 2008 +0100
x86: microcode_amd: consolidate macro definitions
Impact: cleanup
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 29d0887ffd084cde9d6a1286cb82b71701a974dd
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:16:34 2008 +0100
x86: microcode_amd: replace inline asm by common rdmsr/wrmsr functions
Impact: cleanup
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0657d9ebff186dcdb17e582dcb909028775a7707
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:14:05 2008 +0100
x86: microcode_amd: don't pass superfluous function pointer for
get_ucode_data
Impact: cleanup
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8c135206c826095c852c16d94a0a74eeaf05c90d
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:13:00 2008 +0100
x86: microcode_amd: fix compile warning
Impact: fix build warning
CC arch/x86/kernel/microcode_amd.o
arch/x86/kernel/microcode_amd.c: In function â??request_microcode_fwâ??:
arch/x86/kernel/microcode_amd.c:393: warning: passing argument 2 of
â??generic_load_microcodeâ?? discards qualifiers from pointer target type
(Respect "const" qualifier of firmware->data.)
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit be957763b01905d33b53cdd25c8df110f94f499a
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:11:23 2008 +0100
x86: microcode_amd: fix checkpatch warnings/errors
Impact: cleanup
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2a3282a77b02fb47576ffbdb4867c8c6eeb83ed5
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:08:53 2008 +0100
x86: microcode_amd: fix typos and trailing whitespaces in log messages
Impact: fix printk typos
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3c763fd77e66e55d029052da31df0abd9920cb1e
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Tue Dec 16 19:07:47 2008 +0100
x86: microcode_amd: fix wrong handling of equivalent CPU id
Impact: fix bug resulting in non-loaded AMD microcode
mc_header->processor_rev_id is a 2 byte value. Similar is true for
equiv_cpu in an equiv_cpu_entry -- only 2 bytes are of interest.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Tue Dec 16 08:32:37 2008 -0300
V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
The v4l_compat_ioctl32() function only tested for the presence of the
ioctl op, not for unlocked_ioctl. So it would always return an error
when used with drivers that use unlocked_ioctl instead of ioctl.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8b21c1e90e633aee3363e3d87e1a0b829bdb420e
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sun Dec 14 19:39:03 2008 -0300
V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
When the tuner modules were moved to common/tuners, a separate customize
option were added for tuners. However, the automatic selection of the
tuners were still using the older option.
This causes that the automatic selection to fail, if DVB_FE_CUSTOMISE is
selected. Also, since those tuners are now under MEDIA_TUNER_CUSTOMIZE
menu, if you unset MEDIA_TUNER_CUSTOMIZE, you can't manually select the
tuners.
This patch fixes this error by replacing DVB_FE_CUSTOMISE by
MEDIA_TUNER_CUSTOMIZE on all places were a tuner is selected.
The patch were generated by this small script:
for i in `find drivers/media -name Kconfig`; do
cat $i|perl -ne
's/(MEDIA_TUNER.*)DVB_FE_CUSTOMISE/\1MEDIA_TUNER_CUSTOMIZE/; print $_' >a
mv a $i
done
Also, manually reordered the tuner entries.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f86d4a9173e47050de9f88faa4aaf70a718791c5
Author: Jim Paris <jim@xxxxxxxx>
Date: Wed Dec 10 05:50:44 2008 -0300
V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
Signed-off-by: Jim Paris <jim@xxxxxxxx>
Signed-off-by: Jean-Francois Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 11c6c7fb89a7526841eb4f294de631f3b8a31f10
Author: Antti Seppälä <a.seppala+linux-dvb@xxxxxxxxx>
Date: Mon Dec 1 06:59:37 2008 -0300
V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
At some point the Flexcop driver was changed to support newer Flexcop cards.
These modifications however broke the detection of Cablestar 2 DVB-C cards.
The reason is that the earlier version of the driver used to retry
unsuccessful i2c operations. The demodulator of Cablestar 2 cards (stv0297)
seems to be very dependent on these retries and adding them back fixes
Cablestar detection.
This patch restores this behaviour for the CableStar2.
Signed-off-by: Antti Seppälä <a.seppala@xxxxxxxxx>
Signed-off-by: Patrick Boettcher <pb@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4b330bee66e88c94789d2eea250dd1fd454a645e
Author: Devin Heitmueller <devin.heitmueller@xxxxxxxxx>
Date: Mon Dec 1 06:51:14 2008 -0300
V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
A user noticed that there would continue to be 4-6 keypresses even after the
user stopped holding down the button. This was because we were not reading
the bulk pipe faster than the firmware was injecting information, which
would
result in a backlog.
Make the query interval faster, and increase the number of cycles before we
start repeating to compensate.
Thanks to Knud Poulsen <knud.poulsen@xxxxxxxxx> for pointing this out.
Signed-off-by: Devin Heitmueller <devin.heitmueller@xxxxxxxxx>
Signed-off-by: Patrick Boettcher <pb@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b6fd6f26733e864fba2ea3eb1d716e23d2e66f3a
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 19:23:36 2008 +0100
x86, mm: limit MAXMEM on 64-bit
on 64-bit x86 the physical memory limit is controlled by the sparsemem
bits - which are 44 bits right now. But MAXMEM (the max pfn number
e820 parsing will allow to enter our sizing routines) is set to
0x00003fffffffffff, i.e. 46 bits - that's too large because it overlaps
into the vmalloc range.
So couple MAXMEM to MAX_PHYSMEM_BITS, and add a comment that the
maximum of MAX_PHYSMEM_BITS is 45 bits.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cfc319833b5b359bf3bce99564dbac00af7925ac
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:46:58 2008 +0000
x86, 32-bit: improve lazy TLB handling code
Impact: micro-optimize the 32-bit TLB flush code
Use the faster x86_{read,write}_percpu() accessors here.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit beeb4195cbc80b7489631361b7ed38b7518af433
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:45:56 2008 +0000
x86, 32-bit: add some compile time checks to mem_init()
Some of the inconsistencies checked for at run time can be detected at
build time already, so duplicate the checks done at run time to also be
done at build time.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d6be89ad660c5d03edef91715093d447025df59b
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:42:45 2008 +0000
x86, 32-bit: simplify alloc_low_page()
Impact: cleanup
Neither of the callers really needs the physical address this function
returns, so eliminate the pointless argument.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit b93a531e315e97ef00367099e6b5f19651936e20
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:40:27 2008 +0000
allow bug table entries to use relative pointers (and use it on x86-64)
Impact: reduce bug table size
This allows reducing the bug table size by half. Perhaps there are
other 64-bit architectures that could also make use of this.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 1796316a8b028a148be48ba5d4e7be493a39d173
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 16 11:35:24 2008 +0000
x86: consolidate __swp_XXX() macros
Impact: cleanup, code robustization
The __swp_...() macros silently relied upon which bits are used for
_PAGE_FILE and _PAGE_PROTNONE. After having changed _PAGE_PROTNONE in
our Xen kernel to no longer overlap _PAGE_PAT, live locks and crashes
were reported that could have been avoided if these macros properly
used the symbolic constants. Since, as pointed out earlier, for Xen
Dom0 support mainline likewise will need to eliminate the conflict
between _PAGE_PAT and _PAGE_PROTNONE, this patch does all the necessary
adjustments, plus it introduces a mechanism to check consistency
between MAX_SWAPFILES_SHIFT and the actual encoding macros.
This also fixes a latent bug in that x86-64 used a 6-bit mask in
__swp_type(), and if MAX_SWAPFILES_SHIFT was increased beyond 5 in (the
seemingly unrelated) linux/swap.h, this would have resulted in a
collision with _PAGE_FILE.
Non-PAE 32-bit code gets similarly adjusted for its pte_to_pgoff() and
pgoff_to_pte() calculations.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d072c25f531c6513994960401d2c7f059434c0d2
Author: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Date: Tue Dec 16 15:53:11 2008 +0100
x86, bts: correctly report invalid bts records
Impact: change the reporting of empty BTS records
Correctly report a cleared BTS record as invalid. Used to be reported
as branch from 0 to 0.
Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cc1dc6d039ced64c2f8b8457bf1cccf4ecfc5942
Author: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Date: Tue Dec 16 15:51:03 2008 +0100
x86, bts: remove recursion from get_context
Impact: cleanup
Optimistically allocate a DS context. It is extremely unlikely that
one already existed. This simplifies the code a lot.
Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bb1f24bf00a85f666b56a09b7cdbfd221af16c2c
Author: Ben Stanley <Ben.Stanley@xxxxxxxxxxxxxx>
Date: Mon Dec 15 23:38:12 2008 +1100
ALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1
This patch removes an inconsistency that became apparent when I
documented the fields of snd_ca0106_details. spi_dac is always
used in a 'boolean' sense, so this cleanup should make no difference.
[Actually, there is one place checking explicitly spi_dac == 1, so
this will change the behavior. But, supposing it's rather a typo,
I apply this clean-up patch -- tiwai]
Signed-off-by: Ben Stanley <Ben.Stanley@xxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit f649a7145b8b67121e8be0b50f7861755f21aa3b
Author: Ben Stanley <Ben.Stanley@xxxxxxxxxxxxxx>
Date: Fri Dec 12 09:47:13 2008 +1100
ALSA: ca0106 Add comments to snd_ca0106_details struct
Takashi wrote an email [1] explaining the fields of snd_ca0106_details,
so I captured the information into the ca0106.h header file.
[1]
http://article.gmane.org/gmane.linux.alsa.devel/56783/match=takashi+gpio_type
Signed-off-by: Ben Stanley <Ben.Stanley@xxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 31117b78ee843622cbc4c7c17c97be417c766385
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue Dec 16 14:43:21 2008 +0100
ALSA: hda - Add Nvidia vendor id string
Added Nvidia (0x10de) to the vendor id list.
Cleaned up the codec name strings accordingly.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit e9515c3c9feecd74174c2998add0db51e02abb8d
Author: Ken Chen <kenchen@xxxxxxxxxx>
Date: Mon Dec 15 22:04:15 2008 -0800
sched, cpuacct: export percpu cpuacct cgroup stats
This patch export per-cpu CPU cycle usage for a given cpuacct cgroup.
There is a need for a user space monitor daemon to track group CPU
usage on per-cpu base. It is also useful for monitoring CFS load
balancer behavior by tracking per CPU group usage.
Signed-off-by: Ken Chen <kenchen@xxxxxxxxxx>
Reviewed-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 720f54988e17b33f3f477010b3a68ee872d20d5a
Author: Ken Chen <kenchen@xxxxxxxxxx>
Date: Mon Dec 15 22:02:01 2008 -0800
sched, cpuacct: refactoring cpuusage_read / cpuusage_write
Impact: micro-optimize the code on 64-bit architectures
In the thread regarding to 'export percpu cpuacct cgroup stats'
http://lkml.org/lkml/2008/12/7/13
akpm pointed out that current cpuacct code is inefficient. This patch
refactoring the following:
* make cpu_rq locking only on 32-bit
* change iterator to each_present_cpu instead of each_possible_cpu to
make it hotplug friendly.
It's a bit of code churn, but I was rewarded with 160 byte code size saving
on x86-64 arch and zero code size change on i386.
Signed-off-by: Ken Chen <kenchen@xxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9dfc3bc7d21864d47797d64b8d531d4dbbc0b618
Merge: da485e0cb16726797e99a595a399b9fc721b91bc
cbc34ed1ac36690f75fd272e19e7b4fc29aae5a2
2bed8446819a7c5033aa1da138d9f230ae212edc
ffc2238af8431d930d2c15f16feecf1fd6d75642
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 16 12:03:38 2008 +0100
Merge branches 'tracing/fastboot', 'tracing/ftrace',
'tracing/function-graph-tracer' and 'tracing/hw-branch-tracing' into
tracing/core
commit 9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b
Author: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Date: Tue Dec 16 02:08:29 2008 -0800
ipv6: fix the outgoing interface selection order in udpv6_sendmsg()
1.When no interface is specified in an IPV6_PKTINFO ancillary data
item, the interface specified in an IPV6_PKTINFO sticky optionis
is used.
RFC3542:
6.7. Summary of Outgoing Interface Selection
This document and [RFC-3493] specify various methods that affect the
selection of the packet's outgoing interface. This subsection
summarizes the ordering among those in order to ensure deterministic
behavior.
For a given outgoing packet on a given socket, the outgoing interface
is determined in the following order:
1. if an interface is specified in an IPV6_PKTINFO ancillary data
item, the interface is used.
2. otherwise, if an interface is specified in an IPV6_PKTINFO sticky
option, the interface is used.
Signed-off-by: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f250dcdac111a8369220b8e192eae6c56dc1098a
Author: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Date: Tue Dec 16 02:07:45 2008 -0800
ipv6: fix the return interface index when get it while no message is
received
When get receiving interface index while no message is received,
the the value seted with setsockopt() should be returned.
RFC 3542:
Issuing getsockopt() for the above options will return the sticky
option value i.e., the value set with setsockopt(). If no sticky
option value has been set getsockopt() will return the following
values:
- For the IPV6_PKTINFO option, it will return an in6_pktinfo
structure with ipi6_addr being in6addr_any and ipi6_ifindex being
zero.
Signed-off-by: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b24a2516d10751d7ed5afb58420df25370c9dffb
Author: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Date: Tue Dec 16 02:06:23 2008 -0800
ipv6: Add IPV6_PKTINFO sticky option support to setsockopt()
There are three reasons for me to add this support:
1.When no interface is specified in an IPV6_PKTINFO ancillary data
item, the interface specified in an IPV6_PKTINFO sticky optionis
is used.
RFC3542:
6.7. Summary of Outgoing Interface Selection
This document and [RFC-3493] specify various methods that affect the
selection of the packet's outgoing interface. This subsection
summarizes the ordering among those in order to ensure deterministic
behavior.
For a given outgoing packet on a given socket, the outgoing interface
is determined in the following order:
1. if an interface is specified in an IPV6_PKTINFO ancillary data
item, the interface is used.
2. otherwise, if an interface is specified in an IPV6_PKTINFO sticky
option, the interface is used.
2.When no IPV6_PKTINFO ancillary data is received,getsockopt() should
return the sticky option value which set with setsockopt().
RFC 3542:
Issuing getsockopt() for the above options will return the sticky
option value i.e., the value set with setsockopt(). If no sticky
option value has been set getsockopt() will return the following
values:
3.Make the setsockopt implementation POSIX compliant.
Signed-off-by: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bc02ff95fe4ebd3e5ee7455c0aa6f76ebe39ebca
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Tue Dec 16 02:00:48 2008 -0800
net: Refactor full duplex flow control resolution
These 4 drivers have identical full duplex flow control resolution
functions. This patch changes them all to use one common function.
The function in question decides whether a device should enable TX and
RX flow control in a standard way (IEEE 802.3-2005 table 28B-3), so this
should also be useful for other drivers.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e18ce3465477502108187c6c08b6423fb784a313
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Tue Dec 16 02:00:00 2008 -0800
net: Move flow control definitions to mii.h
flags used within drivers for indicating tx and rx flow control are
defined in 4 drivers (and probably more), move these constants to mii.h.
The 3 SMSC drivers use the same constants (FLOW_CTRL_TX), but TG3 uses
TG3_FLOW_CTRL_TX, so this patch also renames the constants within TG3.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f9867328f9e1c3fceb8593f84b980aa1d648ce9c
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Tue Dec 16 01:55:38 2008 -0800
simeth: convert to net_device_ops
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8207befa199c9ade670d1cf9a5bcdc76310751bd
Author: Divy Le Ray <divy@xxxxxxxxxxx>
Date: Tue Dec 16 01:51:47 2008 -0800
cxgb3: untie strict FW matching
The NIC driver can work with mutliple versions of the FW.
Let the driver load when the embedded FW does not match,
and the FW update mechanism failed.
The iWARP module will make its own loading decision.
Signed-off-by: Divy Le Ray <divy@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5ad258c0a85a7cc03c46874e8a26c7e9b4dfb90d
Author: Oliver Hartkopp <oliver@xxxxxxxxxxxx>
Date: Tue Dec 16 01:42:50 2008 -0800
vcan: convert to net_device_ops
Signed-off-by: Oliver Hartkopp <oliver@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ffcebb163c6ddba11abd2e8aabc7a8a88982e4f4
Author: James Chapman <jchapman@xxxxxxxxxxx>
Date: Tue Dec 16 01:23:49 2008 -0800
l2tp: fix UDP checksum support
The pppol2tp driver has had broken UDP checksum code for a long
time. This patch fixes it. If UDP checksums are enabled in the
tunnel's UDP socket, the L2TP driver now properly validates the
checksum on receive and fills in the checksum on transmit. If the
network device has hardware checksum support and is enabled, it is
used instead of generating/checking the checksum in software.
Signed-off-by: James Chapman <jchapman@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 09a2c3c0d3d3550675b766aa5edc28ffee79d7ab
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Tue Dec 16 01:18:31 2008 -0800
Phonet: improve GPRS variable names
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4ee59d54c3f91f1f3ad7f2856b27981414430f9e
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Tue Dec 16 01:17:33 2008 -0800
isdn: eicon: fix sparse warning: make global functions static
Fix this sparse warnings by making the functions static:
drivers/isdn/hardware/eicon/di.c:356:6: warning: symbol 'isdn_rc' was not
declared. Should it be static?
drivers/isdn/hardware/eicon/di.c:558:6: warning: symbol 'isdn_ind' was
not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:595:6: warning: symbol 'api_parse'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:634:6: warning: symbol
'api_save_msg' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:666:6: warning: symbol
'api_load_msg' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:3417:6: warning: symbol
'manufacturer_req' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:3745:6: warning: symbol
'manufacturer_res' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:4077:6: warning: symbol
'control_rc' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:4743:6: warning: symbol 'data_rc'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:4779:6: warning: symbol 'data_ack'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:4805:6: warning: symbol 'sig_ind'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:6173:6: warning: symbol 'SendInfo'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:6349:6: warning: symbol
'SendMultiIE' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:6468:6: warning: symbol 'nl_ind'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:7250:6: warning: symbol 'get_plci'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:7409:6: warning: symbol 'add_d' was
not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:7427:6: warning: symbol 'add_ai'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:7448:6: warning: symbol 'add_b1'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:7912:6: warning: symbol 'add_b23'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:8709:6: warning: symbol
'nl_req_ncci' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:8731:6: warning: symbol 'send_req'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:8866:6: warning: symbol
'listen_check' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:8909:6: warning: symbol 'IndParse'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:8994:6: warning: symbol
'ie_compare' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:9003:6: warning: symbol 'find_cip'
was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:9071:6: warning: symbol
'SetVoiceChannel' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:9089:6: warning: symbol
'VoiceChannelOff' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:9102:6: warning: symbol
'AdvCodecSupport' was not declared. Should it be static?
drivers/isdn/hardware/eicon/message.c:9198:6: warning: symbol
'CodecIdCheck' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 205516c12dbba003c26b42cfb41e598631300106
Author: Ken Chen <kenchen@xxxxxxxxxx>
Date: Tue Dec 16 00:32:21 2008 -0800
x86: convert rdtscll() to use __native_read_tsc
Impact: micro-optimization
Is there any reason why x86 rdtscll have to use the out of line
function instead of inline __native_read_tsc()? native_read_tsc and
__native_read_tsc is essentially the same functions.
Patch to let x86 rdtscll() to use the inline version of read_tsc.
Signed-off-by: Ken Chen <kenchen@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit b1879204dda06a92a4ff55b681c99ee185180003
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Tue Dec 16 01:15:11 2008 -0800
ipmr: merge common code
Also removes redundant skb->len < x check which can't
be true once pskb_may_pull(skb, x) succeeded.
$ diff-funcs pim_rcv ipmr.c ipmr.c pim_rcv_v1
--- ipmr.c:pim_rcv()
+++ ipmr.c:pim_rcv_v1()
@@ -1,22 +1,27 @@
-static int pim_rcv(struct sk_buff * skb)
+int pim_rcv_v1(struct sk_buff * skb)
{
- struct pimreghdr *pim;
+ struct igmphdr *pim;
struct iphdr *encap;
struct net_device *reg_dev = NULL;
if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(*encap)))
goto drop;
- pim = (struct pimreghdr *)skb_transport_header(skb);
- if (pim->type != ((PIM_VERSION<<4)|(PIM_REGISTER)) ||
- (pim->flags&PIM_NULL_REGISTER) ||
- (ip_compute_csum((void *)pim, sizeof(*pim)) != 0 &&
- csum_fold(skb_checksum(skb, 0, skb->len, 0))))
+ pim = igmp_hdr(skb);
+
+ if (!mroute_do_pim ||
+ skb->len < sizeof(*pim) + sizeof(*encap) ||
+ pim->group != PIM_V1_VERSION || pim->code != PIM_V1_REGISTER)
goto drop;
- /* check if the inner packet is destined to mcast group */
encap = (struct iphdr *)(skb_transport_header(skb) +
- sizeof(struct pimreghdr));
+ sizeof(struct igmphdr));
+ /*
+ Check that:
+ a. packet is really destinted to a multicast group
+ b. packet is not a NULL-REGISTER
+ c. packet is not truncated
+ */
if (!ipv4_is_multicast(encap->daddr) ||
encap->tot_len == 0 ||
ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
@@ -40,9 +45,9 @@
skb->ip_summed = 0;
skb->pkt_type = PACKET_HOST;
dst_release(skb->dst);
+ skb->dst = NULL;
reg_dev->stats.rx_bytes += skb->len;
reg_dev->stats.rx_packets++;
- skb->dst = NULL;
nf_reset(skb);
netif_rx(skb);
dev_put(reg_dev);
$ codiff net/ipv4/ipmr.o.old net/ipv4/ipmr.o.new
net/ipv4/ipmr.c:
pim_rcv_v1 | -283
pim_rcv | -284
2 functions changed, 567 bytes removed
net/ipv4/ipmr.c:
__pim_rcv | +307
1 function changed, 307 bytes added
net/ipv4/ipmr.o.new:
3 functions changed, 307 bytes added, 567 bytes removed, diff: -260
(Tested on x86_64).
It seems that pimlen arg could be left out as well and
eq-sizedness of structs trapped with BUILD_BUG_ON but
I don't think that's more than a cosmetic flaw since there
aren't that many args anyway.
Compile tested.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c40cf519f0c0f0cb0579d853949ef517a8bb494d
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Tue Dec 16 01:14:21 2008 -0800
hp100: use roundup instead of open coding
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 82ad33297410c1af8e993210da76e114a4c1670d
Author: Divy Le Ray <divy@xxxxxxxxxxx>
Date: Tue Dec 16 01:09:39 2008 -0800
cxgb3: Add multiple Tx queue support.
Implement NIC Tx multiqueue.
Bump up driver version.
Signed-off-by: Divy Le Ray <divy@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 34f28ecd0f4bdc733c681294d02d9fab5880591b
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Tue Dec 16 08:45:31 2008 +0100
sched: optimize update_curr()
Impact: micro-optimization
Skip the hard work when there is none.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Acked-by: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 03e89e4574a680af15f59329b061f35d9813aff4
Author: Mike Galbraith <efault@xxxxxx>
Date: Tue Dec 16 08:45:30 2008 +0100
sched: fix wakeup preemption clock
Impact: sharpen the wakeup-granularity to always be against current
scheduler time
It was possible to do the preemption check against an old time stamp.
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 89c88b16f12e9df9ac39418638f267ec3b36a6c6
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:46:15 2008 -0800
e1000e: Add GRO support
This patch adds GRO support to e1000e by making it invoke napi_gro_receive
instead of netif_receive_skb.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b240a0e5644eb817c4a397098a40e1ad42a615bc
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:44:31 2008 -0800
ethtool: Add GGRO and SGRO ops
This patch adds the ethtool ops to enable and disable GRO. It also
makes GRO depend on RX checksum offload much the same as how TSO
depends on SG support.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bf296b125b21b8d558ceb6ec30bb4eba2730cd6b
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:43:36 2008 -0800
tcp: Add GRO support
This patch adds the TCP-specific portion of GRO. The criterion for
merging is extremely strict (the TCP header must match exactly apart
from the checksum) so as to allow refragmentation. Otherwise this
is pretty much identical to LRO, except that we support the merging
of ECN packets.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 71d93b39e52e92aea35f1058d957cf12250d0b75
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:42:33 2008 -0800
net: Add skb_gro_receive
This patch adds the helper skb_gro_receive to merge packets for
GRO. The current method is to allocate a new header skb and then
chain the original packets to its frag_list. This is done to
make it easier to integrate into the existing GSO framework.
In future as GSO is moved into the drivers, we can undo this and
simply chain the original packets together.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 73cc19f1556b95976934de236fd9043f7208844f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:41:09 2008 -0800
ipv4: Add GRO infrastructure
This patch adds GRO support for IPv4.
The criteria for merging is more stringent than LRO, in particular,
we require all fields in the IP header to be identical except for
the length, ID and checksum. In addition, the ID must form an
arithmetic sequence with a difference of one.
The ID requirement might seem overly strict, however, most hardware
TSO solutions already obey this rule. Linux itself also obeys this
whether GSO is in use or not.
In future we could relax this rule by storing the IDs (or rather
making sure that we don't drop them when pulling the aggregate
skb's tail).
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d565b0a1a9b6ee7dff46e1f68b26b526ac11ae50
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:38:52 2008 -0800
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1a881f27c50b4fbd6858a8696a189263621136b0
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:27:47 2008 -0800
net: Add frag_list support to GSO
This patch allows GSO to handle frag_list in a limited way for the
purposes of allowing packets merged by GRO to be refragmented on
output.
Most hardware won't (and aren't expected to) support handling GRO
frag_list packets directly. Therefore we will perform GSO in
software for those cases.
However, for drivers that can support it (such as virtual NICs) we
may not have to segment the packets at all.
Whether the added overhead of GRO/GSO is worthwhile for bridges
and routers when weighed against the benefit of potentially
increasing the MTU within the host is still an open question.
However, for the case of host nodes this is undoubtedly a win.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 89319d3801d1d3ac29c7df1f067038986f267d29
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 23:26:06 2008 -0800
net: Add frag_list support to skb_segment
This patch adds limited support for handling frag_list packets in
skb_segment. The intention is to support GRO (Generic Receive Offload)
packets which will be constructed by chaining normal packets using
frag_list.
As such we require all frag_list members terminate on exact MSS
boundaries. This is checked using BUG_ON.
As there should only be one producer in the kernel of such packets,
namely GRO, this requirement should not be difficult to maintain.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b53c7583e26746ef6f66c866841e10450150ed8e
Author: Kay Sievers <kay.sievers@xxxxxxxx>
Date: Thu Dec 4 10:01:52 2008 -0800
rapidio: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: Matt Porter <mporter@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit aab0d375e01d8c16e7e5b9bd915dfaa0a815418f
Author: Kay Sievers <kay.sievers@xxxxxxxx>
Date: Thu Dec 4 10:02:56 2008 -0800
powerpc: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit f63837f0581fe580168ae1a7d178ded935411747
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 14 19:44:51 2008 +0000
powerpc/mm: Remove flush_HPTE()
The function flush_HPTE() is used in only one place, the implementation
of DEBUG_PAGEALLOC on ppc32.
It's actually a dup of flush_tlb_page() though it's -slightly- more
efficient on hash based processors. We remove it and replace it by
a direct call to the hash flush code on those processors and to
flush_tlb_page() for everybody else.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit e41e811a79a4e328005be2744c3076ebde455088
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 14 19:44:39 2008 +0000
powerpc/mm: Rename tlb_32.c and tlb_64.c to tlb_hash32.c and tlb_hash64.c
This renames the files to clarify the fact that they are used by
the hash based family of CPUs (the 603 being an exception in that
family but is still handled by that code).
This paves the way for the new tlb_nohash.c coming via a subsequent
commit.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 1a37a3fd7f12d8f9f720cceec84e23152e116668
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 14 19:44:24 2008 +0000
powerpc/mm: Add local_flush_tlb_mm() to SW loaded TLB implementations
This adds a local_flush_tlb_mm() call as a pre-requisite for some
SMP work for BookE processors.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit a58f053b93e15b68e7b5f442316329f68269c8d5
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 14 19:44:13 2008 +0000
powerpc: Fix asm EMIT_BUG_ENTRY with !CONFIG_BUG
Instead of not defining it at all, this defines the macro as
being empty, thus avoiding ifdef's in call sites when CONFIG_BUG
is not set.
Also removes an extra whitespace in the existing definition.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 3045b3cb0b068c9f7601786841cda1e0b4647bd9
Author: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Date: Sat Dec 13 17:44:59 2008 +0000
powerpc: Remove dead BIO_VMERGE_BOUNDARY definition
The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY
definition is meaningless now (For POWER, BIO_VMERGE_BOUNDARY has been
meaningless for a long time since POWER disables the virtual merge
feature).
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 7fe519c207e3400dea6d67e1d483a16b11608423
Author: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 11 09:46:44 2008 +0000
powerpc: Introduce ppc_pci_flags accessors
Currently there are a number of platforms that open code access to
the ppc_pci_flags global variable. However, that variable is not
present if CONFIG_PCI is not set, which can lead to a build break.
This introduces a number of accessor functions that are defined
to be empty in the case of CONFIG_PCI being disabled. The
various platform files in the kernel are updated to use these.
Signed-off-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit edc72ac4a0894247a6d3f1157a8ec8d603fff52d
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Thu Dec 11 09:14:25 2008 +0000
powerpc/pseries: Check for GIQ indicator before calling set-indicator
Since "Factor out cpu joining/unjoining the GIQ"
(b4963255ad5a426f04a0bb15c4315fa4bb40cde9) the WARN_ON in
xics_set_cpu_giq() is being triggered during boot on JS20 because the
GIQ indicator is not available on that platform. While the warning is
harmless and the system runs normally, it's nicer to check for the
existence of the indicator before trying to manipulate it.
Implement rtas_indicator_present(), which searches the
/rtas/rtas-indicators property for the given indicator token, and use
this function in xics_set_cpu_giq().
Also use a WARN statement in xics_set_cpu_giq to get better
information on failure.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Acked-by: Milton Miller <miltonm@xxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6ff04c53db97c896ecca9374c0be4f681cf5fe50
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Wed Dec 10 14:28:42 2008 +0000
powerpc/powermac: Use set_hard_smp_processor_id() instead of smp_hw_index
The hard_smp_processor_id functions are the appropriate interfaces for
managing physical CPU ids.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 13a9801eb669d567ab2c8f8db5e50557fef5f636
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Wed Dec 10 14:28:41 2008 +0000
powerpc: Move smp_hw_index to 32-bit code
smp_hw_index isn't used on 64-bit, so move it from smp.c to
setup_32.c.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6b82b3e4b54b2fce2ca11976c535012b836b2016
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 9 09:47:29 2008 +0000
powerpc: Remove `have_of' global variable
The `have_of' variable is a relic from the arch/ppc time, it isn't
useful nowadays.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit eb14f019597cd86c21a6c601d7e900f40030c2e7
Merge: 9a4a84294b0d60b8c287131478f743ba2bc68949
a3dd15444baa9c7522c8457ab564c41219dfb44c
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Dec 15 20:03:50 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
commit 0efbb57e06d881a39a7f261e5c33558aedec0f79
Author: Becky Bruce <beckyb@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 4 08:12:40 2008 +0000
powerpc: Fix !CONFIG_PPC_NEED_DMA_SYNC_OPS build warning
Change #define stubs of dma_sync ops to be empty static inlines
to avoid build warning.
Signed-off-by: Becky Bruce <beckyb@xxxxxxxxxxxxxxxxxxx>
Acked-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 46d01492b2c50791b9b66f9b9154ac8d25acaeb9
Author: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Date: Wed Dec 3 13:52:21 2008 +0000
powerpc/ps3: Add sub-match id modalias support
commit 059e4938f8b060b10c4352e6c45739473bc73267 ("powerpc/ps3: Add a
sub-match
id to ps3_system_bus") forgot to update the module alias support:
- Add the sub-match ids to the module aliases, so udev can distinguish
between different types of sub-devices.
- Rename PS3_MODULE_ALIAS_GRAPHICS to PS3_MODULE_ALIAS_GPU_FB, as ps3fb
binds to the "FB" sub-device.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Signed-off-by: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 62d80749addc969803a173573889f9b01d2459e1
Author: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Date: Wed Dec 3 13:52:15 2008 +0000
powerpc/ps3: Quiet dmesg output
Change the debug message in dma_sb_region_create() from
pr_info() to DBG() to quiet the dmesg output.
Signed-off-by: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 15cb1cc981183861e4e653b67a0ea451f720af85
Author: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Date: Wed Dec 3 13:52:05 2008 +0000
powerpc: Fix typo in pgtable-ppc64.h
Fix a minor comment typo in pgtable-ppc64.h.
Signed-off-by: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 29e931c02b0e54f3d36b930c118e69b507b4b6ff
Author: Nicolas Palix <npalix@xxxxxxx>
Date: Tue Dec 2 03:34:46 2008 +0000
powerpc/chrp: Add missing of_node_put in pci.c
of_node_put is needed before discarding a value received from
of_find_node_by_name, eg in error handling code or when the device
node is no longer used.
The semantic match that catches the bug is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression struct device_node *n;
position p1, p2;
statement S1,S2;
expression E,E1;
expression *ptr != NULL;
@@
(
if (!(n@p1 = of_find_node_by_name(...))) S1
|
n@p1 = of_find_node_by_name(...)
)
<... when != of_node_put(n)
when != if (...) { <+... of_node_put(n) ...+> }
when != true !n || ...
when != n = E
when != E = n
if (!n || ...) S2
...>
(
return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
n = E1
|
E1 = n
)
@script:python@
p1 << r.p1;
p2 << r.p2;
@@
print "* file: %s of_find_node_by_name %s return %s" %
(p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Nicolas Palix <npalix@xxxxxxx>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Acked-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a
Merge: 91cac623262c1c0cd298c5c648a8bd2b647c264d
23e0e8afafd9ac065d81506524adf3339584044b
Author: Paul Mackerras <paulus@xxxxxxxxx>
Date: Tue Dec 16 14:38:58 2008 +1100
Merge branch 'merge' into next
commit 9a4a84294b0d60b8c287131478f743ba2bc68949
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Dec 15 15:14:59 2008 -0800
8390/8390p: Fix compat netdev ops handling.
Based upon a report from Randy Dunlap.
The compat netdev ops assignments need to happen in
8390.c and 8390p.c, not lib8390.c, as only the type
specific code can assign the correct function pointers.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 91cac623262c1c0cd298c5c648a8bd2b647c264d
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 13 17:41:41 2008 -0600
powerpc/85xx: Fix compile issues with mpc8572ds.dts
Fix the localbus reg & range properties to respect that the top
level #address-cells and #size-cells = 2. The original commit
(c64ef80b517680f1e228b2ee55e3ce7cd94c7fe0) did not do that.
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 8309ce7280536b07716026ff588acbcc0ee1a546
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 12 17:33:25 2008 +1100
powerpc: Fix bogus cache flushing on all 40x and BookE processors v2
We were missing the CPU_FTR_NOEXECUTE bit in our cputable for all
these processors. The result is that update_mmu_cache() would flush
the cache for all pages mapped to userspace which is totally
unnecessary on those processors since we already handle flushing
on execute in the page fault path.
This should provide a nice speed up ;-)
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 3d1ee379bd576c0830050c2d313e77b9f98a8013
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 15 15:43:43 2008 +0000
ALSA: Fix declaration of sound_class
Include sound/core.h in sound_core.c so that sound_class is declared
before it is defined, avoiding it looking like it should be static.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 8b124a8e14c04378466ddfe63e41fc5035f957eb
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Mon Dec 15 01:06:23 2008 -0800
net: fix dcbnl_setnumtcs operation check
dcbml_setnumtcs wasn't checking for the presence of the setnumtcs
function. Instead, it was checking for setstate which was a bug.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5ecc361444a0c641a73cce05fb652d0e3c944451
Author: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Date: Mon Dec 15 01:00:57 2008 -0800
ixgbe: fix dma mapping unbalance
This issue was initially reported by Joerg Roedel <joerg.roedel@xxxxxxx>
It appears that ixgbe has had a long standing bug where it was unmapping a
different size than it had mapped.
ixgbe 0000:02:00.0: PCI-DMA: device driver frees DMA memory with different
sizes than it mapped.
ixgbe 0000:02:00.0: PCI-DMA: device driver frees DMA memory with different
size [device address=0x0000000003fed812] [map size=258 bytes] [unmap size=256
bytes]
Pid: 6178, comm: rmmod Not tainted 2.6.28-rc5 #4 Call Trace:
[<ffffffff8022a2ae>] iommu_queue_inv_iommu_pages+0x5e/0x70
[<ffffffff80225956>] check_unmap+0x1c6/0x240 [<ffffffff80225ff5>]
debug_unmap_single+0xb5/0x110 [<ffffffffa0213997>]
ixgbe_clean_rx_ring+0x147/0x220 [<ffffffffa0214d7d>] ixgbe_down+0x2fd/0x3d0
[ixgbe] [<ffffffffa02150b3>] ixgbe_close+0x13/0xc0 [ixgbe]
[<ffffffff80431326>] dev_close+0x56/0xa0 [<ffffffff804313b3>]
rollback_registered+0x43/0x220 [<ffffffff804315a5>]
unregister_netdevice+0x15/0x60 [<ffffffff80431601>]
unregister_netdev+0x11/0x20 [<ffffffffa021aef8>] ixgbe_remove+0x48/0x16e
[ixgbe] [<ffffffff80386ffc>] pci_device_remove+0x2c/0x60 [<ffffffff803ef929>]
__device_release_driver+0x99/0x100
[<ffffffff803efa48>] driver_detach+0xb8/0xc0 [<ffffffff803eea6e>]
bus_remove_driver+0x8e/0xd0 [<ffffffff80387374>]
pci_unregister_driver+0x34/0x90 [<ffffffff8026c6c7>]
sys_delete_module+0x1c7/0x2a0 [<ffffffff802a9ce9>] do_munmap+0x349/0x390
[<ffffffff80374481>] __up_write+0x21/0x150 [<ffffffff8020c30b>]
system_call_fastpath+0x16/0x1b
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a7276db6adfded660eec1e1629710b8b82d83455
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Mon Dec 15 00:59:47 2008 -0800
smsc9420: add ethtool register dump support
This patch adds support for SMSC's LAN9420 PCI ethernet controller
to ethtool's dump registers (-d) command.
This patch is for use with an accompanying ethtool patch, which decodes
the register dump.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b1721d2bb9d015d7e49079414671569a2fc0ac9b
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:19:48 2008 -0800
rpc/rdma: goto instead of copypaste
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 79f55f11a090d9f369448dcb58242c7924873920
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:19:02 2008 -0800
nf/dccp: merge errorpaths
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e780f1c33d76ebb81607a6b5d6b669edb9065a7f
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:18:30 2008 -0800
irda: merge exit paths
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 037322abe6141e32e1b1dea86a9405d52c99be5d
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:18:00 2008 -0800
bt/rfcomm/tty: join error paths
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0eae1b98cf3022715b5a6ea5f1ac6b0bd7ac4edd
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:17:26 2008 -0800
ax25: join the return paths that free skb
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ebad5c0984e06f4036d2eb2741b9afce736b8a06
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:16:58 2008 -0800
can: merge error paths
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d8eb93078cedbbf4b7e18e1d7054171c7b70b442
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:16:22 2008 -0800
xfrm: join error paths
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8da73b73ef29d537ba09f29393cd68707833e746
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:15:49 2008 -0800
ip6mr: use goto to common label instead of opencoding
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 448eb71f40120a8fd11ebd58153c271c63e6f862
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:15:21 2008 -0800
ipv6/mcast: join error paths using goto
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5ce1bbb97bf1e6707102d30499e7feaa1e6a2134
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:13:48 2008 -0800
xfrm6_tunnel: join error paths using goto
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 857a6e0a4d8db0bbee685ccc97c6bd7987e7aede
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Sun Dec 14 23:13:08 2008 -0800
icsk: join error paths using goto
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9cd28ab0051cc5232e3dffea6b318233445a3d5f
Author: Alexander Beregalov <a.beregalov@xxxxxxxxx>
Date: Sat Dec 13 16:25:27 2008 +0300
ASoC: switch davinci DPRINTK to pr_debug()
Signed-off-by: Alexander Beregalov <a.beregalov@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit a6ba0cb35da64d658b7a01ea4597416f8522d5e1
Author: Jiri Slaby <jirislaby@xxxxxxxxx>
Date: Wed Dec 10 13:48:38 2008 +0100
kbuild: fix string equality testing in tags.sh
Test of string equality in shells is =, not C-like ==.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 709cc372cad628846d73447edfd95ac39c8e2319
Author: Jiri Slaby <jirislaby@xxxxxxxxx>
Date: Wed Dec 10 13:10:13 2008 +0100
kbuild: fix make tags/cscope
- fix combining O=... and tags
- don't allow * expansion during sh function calls
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
[sam: use KBUILD_SRC to check if we use O=...]
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 31110ebbec8688c6e9597b641101afc94e1c762a
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Sat Dec 13 23:00:45 2008 +0100
kbuild: fix make incompatibility
"Paul Smith" <psmith@xxxxxxx> reported that we would fail
to build with a new check that may be enabled in an
upcoming version of make.
The error was:
Makefile:442: *** mixed implicit and normal rules. Stop.
The problem is that we did stuff like this:
config %config: ...
The solution was simple - the above was split into two with identical
prerequisites and commands.
With only three lines it was not worth to try to avoid the duplication.
Cc: "Paul Smith" <psmith@xxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 012b215ceb55aa38826f091cecfd373cc9bbb05b
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Fri Dec 12 22:32:22 2008 -0800
smsc9420: add ethtool eeprom support
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e312674ffb5281a46a3ad06604edea6426c4eb24
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Fri Dec 12 22:31:50 2008 -0800
smsc9420: add netpoll support
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1757ab2f0411110c0261dfb66d26faf63037c531
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Fri Dec 12 22:31:16 2008 -0800
smsc911x: make smsc911x_poll_controller static
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 56bde885903bdb9d9531fd569096ec8c7a2d60ee
Merge: a7a81fc060f050ad4ba7f6ef5cdc583dad2f7b21
a7b75207bd37cbbfa0b4ee7dbaf0dc6bafec8fea
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 12 22:20:51 2008 -0800
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit a7a81fc060f050ad4ba7f6ef5cdc583dad2f7b21
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:10:23 2008 -0800
sfc: Version 2.3
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7dde596ef79982327d8992a579a137b4035ad599
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:09:38 2008 -0800
sfc: Fix synchronisation of efx_mtd_{probe,rename,remove}
Currently efx_mtd_rename() can race with the probe() and remove()
functions.
Move probe() before device registration and remove() after
unregistration. Move initialisation/update of all names based on the
netdev name into a new function and call it under the RTNL immediately
after registration.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0c53d8c84047d86169bd4147bb8f5adf2772d2bb
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:08:50 2008 -0800
sfc: Use kzalloc() to ensure struct efx_spi_device is fully initialised
Currently the mtd field is not initialised early enough.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fa402b2ea9cacd1ec94fa77e3efb506a5d034da6
Author: Steve Hodgson <shodgson@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:08:16 2008 -0800
sfc: Treat probe as unsuccessful if it scheduled a reset
From: Steve Hodgson <shodgson@xxxxxxxxxxxxxx>
efx_pci_probe_main() can return success despite a reset being scheduled.
Catch this and retry or abort probe depending on the reset type.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ab377358701a981e7fae1332e76b1e5d3b3b313d
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:06:54 2008 -0800
sfc: Use model numbers for PHY type names
Some of the PHY type names are overly generic. Change them to include
the model numbers of the PHYs they represent.
Correct the model number reference at the top of xfp_phy.c.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ca54a9f525236c389f464d0952c8a7d6a4035906
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:06:24 2008 -0800
sfc: Use mutex_lock_interruptible() for ethtool EEPROM access
ethtool must contend with the MTD driver for the SPI bus lock, which
may carry out long operations such as flash erase. Allow it to be
interrupted while waiting.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 11e66966277ea8a3353ad2c2773257973553e73a
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:05:48 2008 -0800
sfc: Specify a meaningful component for loopback RX-side and PHY tests
Our ethtool self-test result names each begin with a component name. For
some results this is "port0", which is not very meaningful. Change that
to "rx" or "phy" as appropriate.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b45319382150008ed7cd31b7965392d55fe68967
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:05:01 2008 -0800
sfc: Remove leading spaces
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6f158d5f29b420438e907d72cb111ddb9973f00a
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:00:49 2008 -0800
sfc: Add support for SFN4111T
Add support code for the SFN4111T 100/1000/10GBASE-T reference design,
based in part on the existing code for the SFE4001.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e6fa2eb789f49dc51a20d3db0d410bc8158abb43
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 22:00:17 2008 -0800
sfc: Add support for Solarflare 10Xpress SFT9001
Add type codes for the new PHY and rename the SFX7101 type code.
Add definition of clause 22 extension MMD.
Adapt the 10Xpress SFX7101 code to support the SFT9001 as well.
Clean up register definitions.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 766ca0fa6bf1600bdf4bc7726c74f14c8455c6b8
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:59:24 2008 -0800
sfc: Rework MAC, PHY and board event handling
From: Steve Hodgson <shodgson@xxxxxxxxxxxxxx>
MAC, PHY and board events may be separately enabled and signalled.
Our current arrangement of chaining the polling functions can result
in events being missed. Change them to be more independent.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 04cc8cacb01c09fba2297faf1477cd570ba43f0b
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:50:46 2008 -0800
sfc: Implement auto-negotiation
Add infrastructure for auto-negotiation of speed, duplex and flow
control.
When using 10Xpress, auto-negotiate flow control. While we're
at it, clean up the code to warn when partner is not 10GBASE-T
capable.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 177dfcd80f28f8fbc3e22c2d8b24d21cb86f1d97
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:50:08 2008 -0800
sfc: Add support for sub-10G speeds
The SFC4000 has a separate MAC for use at sub-10G speeds. Introduce
an efx_mac_operations structure with implementations for the two MACs.
Switch between the MACs as necessary.
PHY settings are independent of the MAC, so add get_settings() and
set_settings() to efx_phy_operations. Also add macs field to indicate
which MACs the PHY is connected to.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 356eebb2b3af24cc701823f1e025f04eef333239
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:48:57 2008 -0800
sfc: Clean up MDIO flag setting
We often want to set or clear a flag in an MDIO register, but avoid
writing if no change is required since this can have side-effects.
Encapsulate this in a function, mdio_clause45_set_flag().
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 04300d248bd5166c00a59fa18efc1f7d041e9b32
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:48:09 2008 -0800
sfc: Clean up board identification
Remove kluge for development boards with unspecified board type.
Remove assumption of contiguous board type code assignments.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 06d5e19318e59f6f139b5171f4dfc5f3eb4dd897
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:47:23 2008 -0800
sfc: Add phy_type device attribute
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 27dd2caca4eabe7c13a052b7456495ba75535e6a
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:44:14 2008 -0800
sfc: Add support for MMDs numbered >15
Combine DEVS0 and DEVS1 registers into a 32-bit mask instead of
reading just DEVS0.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f31a45d2f45a7667acd6e85ab6613b0910c55ea9
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:43:33 2008 -0800
sfc: Remove MII extension cruft
Replace efx_nic::link_options bitfield with link_speed (speed in
Mbit/s) and link_fd (full duplex flag).
Remove broken auto-negotiation functions.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5005087728e37db133fee05bb0923c50e673ae99
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:42:42 2008 -0800
sfc: Don't count RX checksum errors during loopback self-test
The loopback self-test checks that IP packets with incorrect checksums
are not altered when sent on a queue with checksum generation off.
These should not contribute to RX error statistics.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 740ced9927cabe0f776265ea24fc399a71bcdef5
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:41:55 2008 -0800
sfc: Abbreviate self-test names so they are not truncated
Change "channel" to "chan".
Shorten PHY loopback names.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 56536e9ce7c23bbc8519b8f99837493dea8da57d
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:37:02 2008 -0800
sfc: Provide hints to irqbalance daemon
Allocate IRQs with the name format <device>[-<type>]-<number> so that
future versions of irqbalanced understand what we're doing.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 28b581ab0a0aa7bc8b22935779ca3e8d6f651ac7
Author: Neil Turton <nturton@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:41:06 2008 -0800
sfc: Add option to use a separate channel for TX completions
In a bidirectional forwarding test, we find that the best performance
is achieved by sending the TX completion interrupts from one NIC to a
CPU which shares an L2 cache with RX completion interrupts from the
other NIC. To facilitate this, add an option (through a module
parameter) to create separate channels for RX and TX completion with
separate IRQs when MSI-X is available.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 84ae48fe4c1fe8b79fac015df6ad0b0937a7ae37
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:34:54 2008 -0800
sfc: Restore phy_flash_cfg module parameter
This is needed for recovery in case a PHY firmware upgrade is aborted.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2f7f573095132240916a8780cd5ef648c0ad7281
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:34:25 2008 -0800
sfc: Work around unreliable strap pins
The SFC4000 has strap pins indicating the presence of SPI flash and/or
EEPROM. These pins are also used for GPIO, and in some cases they may
be read wrongly at reset. However, on production boards it must boot
from one or the other device, so we can assume the boot device is
present and read the board config from there.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit be4ea89c8df06f48d0d64cf1d9d20009e83c77c8
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:33:50 2008 -0800
sfc: Clean up waits for flash/EEPROM operations
Make falcon_spi_wait() ignore the write timer - it is only relevant to
write commands, it only works for the device that contains VPD, and it
might not be initialised properly at all.
Rename falcon_spi_fast_wait() to falcon_spi_wait_write(), reflecting
its use, and make it wait up to 10 ms (not 1 ms) since buffered writes
to EEPROM may take this long to complete.
Make both wait functions sleep instead of busy-waiting.
Replace wait for command completion at top of falcon_spi_cmd() with a
single poll; no command should be running when the function starts.
Correct some comments.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1ab00629f06fb3c47de6373cd92d086f33775444
Author: Steve Hodgson <shodgson@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:33:02 2008 -0800
sfc: Make reset_workqueue driver-global rather than per-NIC
Each reset is serialised by the rtnl_lock anyway, so there's no win
per-NIC.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 65f667fb472d28c1594d862b213a564e292a466c
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:32:10 2008 -0800
sfc: Correct interpretation of second param to ethtool phys_id()
A value of 0 means indefinite repetition (until interrupted).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2b2734dcbfd2dc6b6e4b00bc6971504d7657a4eb
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:31:36 2008 -0800
sfc: Remove unneeded register write
This was only ever needed for an FPGA version of Falcon.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 23d30f027d1e8ad3bcd6192613122ce925947563
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:56:11 2008 -0800
sfc: Change SPI lengths to type size_t
Based on a patch by Andrew Morton.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a17102b1ba847ca31d9151b877fbf9a38a39a8bb
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:28:20 2008 -0800
sfc: Board support fixes
Set dummy monitor method for unrecognised boards.
Clean up board resources if efx_pci_probe_main() fails after board has
been initialised.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 702c7904a29629e4e6b18d5497abe84bd20c0449
Author: Karsten Keil <kkeil@xxxxxxx>
Date: Fri Dec 12 21:21:57 2008 -0800
misdn: Fix lockdep warning
use correct dynamic spinlock init function.
Signed-off-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c31655fcf2c61f209aab8f4169b0e4afe49b581d
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:20:03 2008 -0800
mISDN: hfcmulti: use __iomem address space modifier
Impact: make use of the __iomem address space modifier, and change u_char *,
u_short * and u_int * to void *
Fix more than 30 sparse warnings of this or similar type:
drivers/isdn/hardware/mISDN/hfcmulti.c:261:31: warning: incorrect type in
argument 2 (different address spaces)
drivers/isdn/hardware/mISDN/hfcmulti.c:261:31: got unsigned char
[usertype] *
drivers/isdn/hardware/mISDN/hfcmulti.c:261:31: expected void volatile
[noderef] <asn:2>*addr
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c46f0a2d40f7ceb5fb696309bcd088ac75d0fe20
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:19:18 2008 -0800
mISDN: timerdev: use __user for mISDN_read's buffer argument
Fix this warning:
drivers/isdn/mISDN/timerdev.c:264:11: warning: incorrect type in
initializer (incompatible argument 2 (different address spaces))
drivers/isdn/mISDN/timerdev.c:264:11: expected int ( *read )( ... )
drivers/isdn/mISDN/timerdev.c:264:11: got int ( static [toplevel]
*<noident> )( ... )
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 047ce8f207b144eb9be094ce7427d6e11a687010
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:18:32 2008 -0800
mISDN: comment out unused symbols
Fix this sparse warnings:
drivers/isdn/hardware/mISDN/hfcmulti.c:794: warning: 'vpm_check' defined
but not used
drivers/isdn/mISDN/dsp_cmx.c:1546: warning: 'dsp_start_jiffies' defined
but not used
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 863a76e5881abe276a55c4490607a960790c5b0b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:17:38 2008 -0800
mISDN: fix sparse warning: symbol 'id' shadows an earlier one
Impact: rename function scope variable
Fix this warning:
drivers/isdn/mISDN/l1oip_core.c:472:8: warning: symbol 'id' shadows an
earlier one
drivers/isdn/mISDN/l1oip_core.c:254:14: originally declared here
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bb68b1d964f89b19dc13d4f685a7d29616e2a4cb
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:16:58 2008 -0800
mISDN: fix sparse warning: symbol 'nskb' shadows an earlier one
Impact: define first occurence of variable 'nskb' in inner most possible
scope
Fix this sparse warning:
drivers/isdn/mISDN/dsp_core.c:746:20: warning: symbol 'nskb' shadows an
earlier one
drivers/isdn/mISDN/dsp_core.c:634:19: originally declared here
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 65a40516b231f693f3afee4df77fc63c08ba8fa9
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:16:06 2008 -0800
mISDN: un-export symbol 'plx_lock'
'plx_lock' is only used within hfcmulti.c.
Fix this warning:
drivers/isdn/hardware/mISDN/hfcmulti.c:176:1: warning: symbol 'plx_lock'
shadows an earlier one
drivers/isdn/hardware/mISDN/hfcmulti.c:175:19: originally declared here
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5b8343540a3d27f87a4d9d72bb39b7d4cc3dd95e
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:15:17 2008 -0800
mISDN: make global symbols static or include header files
The warnings fixed by including an header file for the appropriate
prototype are marked with "*", for all others the corresonponding
symbol has been made static. This patch fixes all such issues in
mISDN.
Fix this sparse warnings:
drivers/isdn/hardware/mISDN/hfcmulti.c:174:5: warning: symbol
'plxsd_master' was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:426:1: warning: symbol
'write_fifo_regio' was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:447:1: warning: symbol
'write_fifo_pcimem' was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:469:1: warning: symbol
'read_fifo_regio' was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:491:1: warning: symbol
'read_fifo_pcimem' was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:710:1: warning: symbol 'vpm_init'
was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:793:1: warning: symbol 'vpm_check'
was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:816:1: warning: symbol
'vpm_echocan_on' was not declared. Should it be static?
drivers/isdn/hardware/mISDN/hfcmulti.c:848:1: warning: symbol
'vpm_echocan_off' was not declared. Should it be static?
* drivers/isdn/mISDN/l1oip_codec.c:224:1: warning: symbol
'l1oip_law_to_4bit' was not declared. Should it be static?
* drivers/isdn/mISDN/l1oip_codec.c:261:1: warning: symbol
'l1oip_4bit_to_law' was not declared. Should it be static?
* drivers/isdn/mISDN/l1oip_codec.c:281:1: warning: symbol
'l1oip_alaw_to_ulaw' was not declared. Should it be static?
* drivers/isdn/mISDN/l1oip_codec.c:294:1: warning: symbol
'l1oip_ulaw_to_alaw' was not declared. Should it be static?
* drivers/isdn/mISDN/l1oip_codec.c:311:1: warning: symbol 'l1oip_4bit_free'
was not declared. Should it be static?
* drivers/isdn/mISDN/l1oip_codec.c:322:1: warning: symbol
'l1oip_4bit_alloc' was not declared. Should it be static?
drivers/isdn/mISDN/core.c:29:1: warning: symbol 'device_lock' was not
declared. Should it be static?
drivers/isdn/mISDN/core.c:34:1: warning: symbol 'bp_lock' was not
declared. Should it be static?
drivers/isdn/mISDN/core.c:196:1: warning: symbol 'mISDNInit' was not
declared. Should it be static?
drivers/isdn/mISDN/core.c:227:6: warning: symbol 'mISDN_cleanup' was not
declared. Should it be static?
drivers/isdn/mISDN/stack.c:40:1: warning: symbol 'mISDN_queue_message'
was not declared. Should it be static?
* drivers/isdn/mISDN/layer1.c:388:1: warning: symbol 'l1_init' was not
declared. Should it be static?
* drivers/isdn/mISDN/layer1.c:400:1: warning: symbol 'l1_cleanup' was not
declared. Should it be static?
drivers/isdn/mISDN/layer2.c:469:1: warning: symbol 'iframe_error' was not
declared. Should it be static?
drivers/isdn/mISDN/layer2.c:487:1: warning: symbol 'super_error' was not
declared. Should it be static?
drivers/isdn/mISDN/layer2.c:496:1: warning: symbol 'unnum_error' was not
declared. Should it be static?
drivers/isdn/mISDN/layer2.c:509:1: warning: symbol 'UI_error' was not
declared. Should it be static?
drivers/isdn/mISDN/layer2.c:522:1: warning: symbol 'FRMR_error' was not
declared. Should it be static?
drivers/isdn/mISDN/layer2.c:1069:1: warning: symbol 'enquiry_cr' was not
declared. Should it be static?
* drivers/isdn/mISDN/layer2.c:2196:1: warning: symbol 'Isdnl2_Init' was not
declared. Should it be static?
* drivers/isdn/mISDN/layer2.c:2210:1: warning: symbol 'Isdnl2_cleanup' was
not declared. Should it be static?
drivers/isdn/mISDN/tei.c:397:1: warning: symbol 'random_ri' was not
declared. Should it be static?
* drivers/isdn/mISDN/timerdev.c:277:1: warning: symbol 'mISDN_inittimer'
was not declared. Should it be static?
* drivers/isdn/mISDN/timerdev.c:288:6: warning: symbol
'mISDN_timer_cleanup' was not declared. Should it be static?
drivers/isdn/mISDN/dsp_core.c:164:12: warning: symbol
'mISDN_dsp_revision' was not declared. Should it be static?
drivers/isdn/mISDN/dsp_cmx.c:1543:5: warning: symbol 'samplecount' was
not declared. Should it be static?
drivers/isdn/mISDN/dsp_cmx.c:1546:5: warning: symbol 'dsp_start_jiffies'
was not declared. Should it be static?
drivers/isdn/mISDN/dsp_cmx.c:1547:16: warning: symbol 'dsp_start_tv' was
not declared. Should it be static?
drivers/isdn/mISDN/dsp_tones.c:239:3: warning: symbol 'pattern' was not
declared. Should it be static?
drivers/isdn/mISDN/dsp_audio.c:33:4: warning: symbol
'dsp_audio_ulaw_to_alaw' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dfa96ec1bb83641242c48883c2bae8f1f30483b2
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:13:45 2008 -0800
mISDN: consistently define 'debug' as '*u_int'
Impact: change data type for variable 'debug' from *int to *u_int,
same for the argument type of mISDN_inittimer
In "core.h" mISDN_inittimer is declared with the argument type "*u_int",
make
the definition in "timerdev.c" match this.
This fixes also this warnings:
drivers/isdn/mISDN/layer1.c:391:8: warning: incorrect type in assignment
(different signedness)
drivers/isdn/mISDN/layer1.c:391:8: expected int *static [toplevel]
debug
drivers/isdn/mISDN/layer1.c:391:8: got unsigned int [usertype] *deb
drivers/isdn/mISDN/layer2.c:2200:8: warning: incorrect type in assignment
(different signedness)
drivers/isdn/mISDN/layer2.c:2200:8: expected int *static [toplevel]
debug
drivers/isdn/mISDN/layer2.c:2200:8: got unsigned int [usertype] *deb
drivers/isdn/mISDN/socket.c:769:8: warning: incorrect type in assignment
(different signedness)
drivers/isdn/mISDN/socket.c:769:8: expected int *static [toplevel]
debug
drivers/isdn/mISDN/socket.c:769:8: got unsigned int [usertype] *deb
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bcf91745091ba3b0813fa79afb5d10b090ea745d
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 12 21:11:28 2008 -0800
mISDN: use NULL pointer instead of plain integer
Fix more than 100 (all remaining in mISDN) sparse warnings:
drivers/isdn/hardware/mISDN/hfcmulti.c:***:**: warning: Using plain
integer as NULL pointer
drivers/isdn/mISDN/dsp_tones.c:***:**: warning: Using plain integer as
NULL pointer
drivers/isdn/mISDN/dsp_pipeline.c:***:**: warning: Using plain integer as
NULL pointer
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a7b75207bd37cbbfa0b4ee7dbaf0dc6bafec8fea
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Thu Dec 11 10:33:41 2008 -0800
iwlwifi: add contact email to MODULE_AUTHOR
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2aa6ab86bc475a115f56645591d2413981846509
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Thu Dec 11 10:33:40 2008 -0800
iwlwifi: remove 4965 from common uCode API structures
This patch removes 4965 from common uCode API structures. Also updates
iwlagn commands with 3945 specific RX command in preparation for 3945 port.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b5047f78664fbcc18d67dafbb45bf62b310f9b0a
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Thu Dec 11 10:33:39 2008 -0800
iwlwifi: remove includes of iwl-helpers.h where not needed
This patch removes includes of iwl-helpers.h where not needed
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 29d51d9df53a4b383e2062b2ea0d575c9f3fca47
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Thu Dec 11 10:33:38 2008 -0800
iwlwifi: remove unused clip_groups priv member
Remove clip_groups from priv and related structure.
This code is for 3945 only and was renamed to 4965 in
when code was split.
Also remove unused RATE definitions
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit edb342286e18c5bec6d3ac325851a9cba28061b9
Author: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Date: Thu Dec 11 10:33:37 2008 -0800
iwlwifi: fix resume while txpower off
This patch take care of coming out rfkill when the driver is up while
rfkill is on by restarting interface.
Signed-off-by: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3d5717ade01ce22511f2992f150bf6644b21c377
Author: Zhu, Yi <yi.zhu@xxxxxxxxx>
Date: Thu Dec 11 10:33:36 2008 -0800
iwlwifi: use iwl_poll_direct_bit in EEPROM reading
The patch replaces the current reading EEPROM loop iterations with
iwl_poll_direct_bit(). It also fixes some comment error.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9c5f89b3f6580cca21dca4ede940900c5b3c3a81
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Thu Dec 11 18:22:13 2008 +0200
ath9k: Do not remove header padding on RX from short frames
The 802.11 header is only padded to 32-bit boundary when the frame has
a non-zero length payload. In other words, control frames (e.g., ACK)
do not have a padding and we should not try to remove it. This fixes
monitor mode for short control frames. In addition, the hdrlen&3 use
is described in more detail to make it easier to understand how the
padding length is calculated.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f2f1ba253d970479343f97c4620e16842c695d03
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Thu Dec 11 14:29:06 2008 +0200
iwlwifi: fix build warning (iwl-rx.c)
This patch fixes the following build warning when CONFIG_IWLWIFI_DEBUG
is not set.
/work/src/wireless-testing/drivers/net/wireless/iwlwifi/iwl-rx.c:758:
warning: 'iwl_dbg_report_frame' defined but not used
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Acked-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ab1f5c0bb8edbaee81c1672733f8dc4d0a5f5ea5
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Thu Dec 11 14:00:25 2008 +0200
mac80211: misc cleanups
This patch removes unneeded member (skbuff) from
ieee80211_ibss_add_sta() method in its declaration (in ieee80211_i.h)
and its callers (in rx.c and mlme.c)
This patch removes unneeded member from struct ieee80211_rx_data
in ieee80211_i.h.
(Originally posted as two patches. -- JWL)
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4dec9b807be757780ca3611a959ac22c28d292a7
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Wed Dec 10 17:48:48 2008 +0100
rfkill: strip pointless notifier chain
No users, so no reason to have it.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6fb532527e2592f82ec07508df2e44f6c7ceff12
Author: Anna Neal <anna@xxxxxxxxxxx>
Date: Tue Dec 9 13:23:45 2008 -0800
libertas: Create sysfs entry for changing the mesh probe response limit
This patch adds the ability to change the number of probe response retries
sent
by the mesh interface.
In dense networks it is recommended to change this value to zero to reduce
traffic congestion.
Signed-off-by: Anna Neal <anna@xxxxxxxxxxx>
Signed-off-by: Andrey Yurovsky <andrey@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b77f483fcf0579de28873828897f53371a33a0ea
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Sun Dec 7 21:44:03 2008 +0530
ath9k: Refactor struct ath_softc
Split ath_softc into smaller structures for rx, tx and beacon
handling.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 59651e89187293e88863891b821c7379391ef75c
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Tue Dec 9 21:07:50 2008 +0100
p54: fix oops on faulty devices
This patch fixes an oops when the devices suddenly starts
to receive martian data frames.
bug reference:
http://marc.info/?l=linux-wireless&m=122872280317635&w=2
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b7a530d82cb36bb43901c196039b0fccee3ffcc3
Author: Jouni Malinen <j@xxxxx>
Date: Wed Dec 10 14:51:47 2008 +0200
mac80211: Disable requests for new scans in AP mode
AP mode operations are seriously affected if mac80211 runs through a
multi-second scan while the AP is trying to send Beacon frames on the
operation channel. While this could be implemented in a way that does
not cause too many problems, it is not very simple and will require
synchronization with Beacon frame scheduling in the drivers (scan one
channel at a time between Beacon frames). Furthermore, such scanning
takes quite a bit longer time and existing userspace applications
would be likely to timeout while waiting for the results.
For now, just refuse requests for new scans (SIOCSIWSCAN) when in AP
mode. In practice, this moves the rejection from iwl* drivers into
mac80211 to make it apply to every mac80211-based driver.
This issue shows up in associated stations getting disconnected when
something (e.g., Network Manager) requests a scan while the interface
is in AP mode. When doing this continuously (e.g., NM does it every 120
seconds), the network gets close to useless.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 14a4dfe2ff8c353f59ae8324059ded1cfe22c7d9
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Wed Dec 10 13:17:26 2008 +0100
ipw2200: fix scanning while associated
This patch fixes sporadic firmware restarts when scanning while associated.
The firmware will quietly cancel a scan (while associated) if the dwell time
for a channel to be scanned is larger than the time it may stay away from
the
operating channel (because of DTIM catching). Unfortunately the driver is
not
notified about the canceled scan and therefore the scan watchdog timeout
will
be hit and the driver causes a firmware restart which results in
disassociation. This mainly happens on passive channels which use a dwell
time
of 120 whereas a typical beacon interval is around 100.
The patch changes the dwell time for passive channels to be slightly smaller
than the actual beacon interval to work around the firmware issue.
Furthermore
the number of allowed beacon misses is increased from one to three as
otherwise
most scans (while associated) won't complete successfully.
However scanning while associated will still fail in corner cases such as a
beacon intervals below 30.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d8004cb9267b15cd902eef01a75bb1ffa3995af8
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Tue Dec 9 23:35:41 2008 -0600
b43legacy: Fix sparse warnings
Sparse yields the following warnings for b43legacy:
CHECK drivers/net/wireless/b43legacy/phy.c
drivers/net/wireless/b43legacy/phy.c:1304:31: warning: potentially
expensive pointer subtraction
drivers/net/wireless/b43legacy/phy.c:1304:31: warning: potentially
expensive pointer subtraction
drivers/net/wireless/b43legacy/phy.c:1304:31: warning: potentially
expensive pointer subtraction
CHECK drivers/net/wireless/b43legacy/debugfs.c
drivers/net/wireless/b43legacy/debugfs.c:243:9: warning: memset with byte
count of 131072
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c1db52b9d27ee6e15a7136e67e4a21dc916cd07f
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Tue Dec 9 23:34:27 2008 -0600
rtl8187: Use usb anchor facilities to manage urbs
When SLUB debugging is enabled in the kernel, and the boot command includes
the option "slub_debug=P", rtl8187 encounters a GPF due to a read-after-free
of a urb.
Following the example of changes in p54usb to fix the same problem, the code
has been modified to use the usb_anchor_urb() method. With this change, the
USB core handles the freeing of urb's.
This patch fixes the problem reported in Kernel Bugzilla #12185
(http://bugzilla.kernel.org/show_bug.cgi?id=12185).
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Tested-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 388cdf31db6dfc3d175786a76989266380e12c26
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:05:38 2008 -0500
ath5k: fix endianness of bitwise ops when installing mic
Fix these bugs found by sparse:
ath5k/pcu.c:1102:21: warning: restricted __le32 degrades to integer
ath5k/pcu.c:1102:13: warning: incorrect type in assignment (different
base types)
ath5k/pcu.c:1102:13: expected restricted __le32 <noident>
ath5k/pcu.c:1102:13: got unsigned int
ath5k/pcu.c:1104:20: warning: restricted __le32 degrades to integer
ath5k/pcu.c:1104:13: warning: incorrect type in assignment (different
base types)
ath5k/pcu.c:1104:13: expected restricted __le32 <noident>
ath5k/pcu.c:1104:13: got unsigned int
Changes-licensed-under: ISC
Reported-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 62d714e5ebec9ad4d63bb9a6da19dfd83d3db860
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Tue Dec 9 23:05:38 2008 +0000
spectrum_cs: Fix function names used in debug strings
Signed-off-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 499b702a8d848aaa15d6255e9302d9186827691e
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Tue Dec 9 21:46:29 2008 +0000
orinoco: Fix inappropriate use of IRQ_BAP
This hardware buffer should only be used from an interrupt. The
wireless event generation functions are called from a workqueue, so use
USER_BAP instead.
Signed-off-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0c06dd8a237c673eedd295fbef7a8c0e52f5c045
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Tue Dec 9 21:46:28 2008 +0000
orinoco: Fix function names used in debug strings
Signed-off-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 39ca5bb76f3382b1cb0062d75ec45abd1c46e6d2
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Tue Dec 9 21:09:00 2008 +0100
p54: enforce strict tx_queue limits
The patch fixes an old FIXME in p54pci.c by moving the "queue full"
check into the common library, where we can deal with it properly.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 30dab79ed40f6c0f8a24e25fd9be7bd873eeeb8b
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 9 11:29:01 2008 -0800
iwlwifi: remove qos module parameter
The ability of disabling qos from module params is not required anymore.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6d1ef1a3e6b4915d4cde897971ce283bdf0d9fbc
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 9 11:29:00 2008 -0800
iwlwifi: 3945 remove qos module parameter
The ability of disabling qos from module params is not required
anymore.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9f925938680b7d1adeb030befb6a4b5f86026b6a
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 9 11:28:59 2008 -0800
iwlifi: remove twice defined SINGLE_FRAME RX FH MASK
This patch removes second definition of FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME
in iwl-fh.h
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Acked-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 759ef89fb096c4a6ef078d3cfd5682ac037bd789
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 9 11:28:58 2008 -0800
iwlwifi: change email contact information
This patch replaces personal emails with hopefully
always valid Intel Linux Wireless, which will be routed
to a current maintainer
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d070d8555fbb3b9114c6f861e5cf017ea1720b67
Author: Pavel Roskin <proski@xxxxxxx>
Date: Tue Dec 9 12:32:15 2008 -0500
airport: remove useless return in a function returning void
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 89fad578a61810b7fdf8edd294890f3c0cde4390
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Tue Dec 9 16:28:06 2008 +0100
mac80211: integrate sta_notify_ps cmds into sta_notify
This patch replaces the newly introduced sta_notify_ps function,
which can be used to notify the driver about every power state
transition for all associated stations, by integrating its functionality
back into the original sta_notify callback.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dd397dc9dddfa2149a1bbc9e52ac7d5630737cec
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Tue Dec 9 15:14:37 2008 +0100
p54usb: rewriting rx/tx routines to make use of usb_anchor's facilities
Alan Stern found several flaws in p54usb's implementation and annotated:
"usb_kill_urb() and similar routines do not expect an URB's completion
routine to deallocate it. Â This is almost obvious -- if the URB is
deallocated
before the completion routine returns then there's no way for usb_kill_urb
to detect when the URB actually is complete."
This patch addresses all known limitations in the old implementation and
fixes
khub's "use-after-freed" hang, when SLUB debug's poisoning option is
enabled.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Cc: stable@xxxxxxxxxx
Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a07d3619faeea3f540dd55f86685136f8928b4ad
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Tue Dec 9 17:23:33 2008 +0530
ath9k: BH shouldn't be enabled when hardirqs are disabled.
ath_tx_complete_buf uses a BH version of spinlock and so releasing
the lock enables BH which is incorrect when called from sta_notify
callback as MAC80211 disables hardirqs before the driver callback
is called.
As ath_tx_complete_buf is shared between user and softirq context
using normal spinlock may not be appropriate. Though the proper
fix would be to cleanup the context properly in the driver code,
this would be an interim fix to avoid kernel warning.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b143923689fdcc8e56688f2506a11ff16e4cd20b
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 12:39:52 2008 +0100
mac80211/cfg80211: check endianness in sparse runs
Make sure sparse checks endianness when run on mac80211/cfg80211.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f546638c3f809fdacddc03fe765669c3042e0d9d
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 12:30:03 2008 +0100
mac80211: remove fragmentation offload functionality
There's no driver that actually does fragmentation on the
device, and the callback is buggy (when it returns an error,
mac80211's fragmentation status is changed so reading the
frag threshold from userspace reads the new value despite
the error). Let's just remove it, if we really find some
hardware supporting it we can add it back later.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e4f2a3458f451d5fb6aa55aac6aaadcf220d0da1
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 12:26:14 2008 +0100
ath9k: remove fragmentation workaround again
Looking at the RC algorithm this is no longer necessary.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 21a49fc674afd00db6de2f729f8c8e4fab2f1bdf
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Tue Dec 9 08:37:28 2008 +0200
iwlwifi: fix build error (iwl-rx.c).
This patch adds #ifdef CONFIG_IWLWIFI_DEBUG in iwl_rx_reply_rx()
method in iwlwifi/iwl-rx.c) to avoid build error caused by "iwlwifi:
implement iwl_debug_report_frame for iwlagn".
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Acked-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8dffff216fcac4f79078478085e86d68db64922e
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 00:10:30 2008 +0100
mac80211: only create default STA interface if supported
Drivers will support this, obviously, but this forces them to
set it up properly.
(This includes the fix posted as "mac80211: fix ifmodes check" and
tested in wireless-testing by Hin-Tak and others. -- JWL)
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Reported-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Tested-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0f202aa2e1e1db1d20da9bcc3f5ad43c5a22d2d5
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 8 14:51:41 2008 -0500
ieee80211_security: correct warning about width of auth_mode
Also remove auth_algo which is unused.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8aa15e1506bb0b6b643be12baf1f2d4d2f115931
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Mon Dec 8 19:43:50 2008 +0530
ath9k: avoid rx frames with corrupted descriptor.
Setting RX_ABORT/RX_DIS after MAC reset and clearing RX_ABORT/RX_DIS
after enbling RXE/RXDP to avoid rx frames with corrupted descriptor
status.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2df1bff4c5cd0b28e06e4defc3f5d90618db8d53
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Mon Dec 8 19:43:49 2008 +0530
ath9k: Incorrect band enum causes invalid antenna configuration.
It's a regression from the patch titled "ath9k: Use mac80211's band
macros and remove enum hal_freq_band". MAC80211 band macros can't be
mapped directly with our hal band enum.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e7594072a5b918510c937c1ab0acad4e8a931bc7
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Mon Dec 8 19:43:48 2008 +0530
ath9k: Adding support for Atheros AR9285 chipset.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e8fbc99edfe0efa0b42f04587a79a6b3371f961a
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Mon Dec 8 19:43:47 2008 +0530
ath9k: Adding initvalues for Atheros AR9285 chipset.
This patch adds the initvalues required for AR9285 chipset.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 02e90d627c80127933ee56ae0e9bf727fde66105
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Mon Dec 8 19:43:46 2008 +0530
ath9k: Adding AR9285 chipset register information.
Adding AR9285 register information.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 306d6112f9b396ed237305036f8e889f8aa964b5
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Mon Dec 8 12:39:04 2008 +0100
cfg80211: fix nl80211 frequency handling
Fix two small bugs with HT frequency setting:
* HT is accepted even when the driver is incapable
* HT40 is accepted when the driver cannot do 40 MHz
(both on the selected band)
Also simplify the code a little.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7ba1c04ed727a70df2dc63464232c0ec906ad67d
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Mon Dec 8 11:18:32 2008 +0100
mac80211: improve sta_notify documentation
Mention more possible STA entries and document the atomic requirement.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8ee5afbc9d2162f0919dd089023fb690f7cf8134
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Sun Dec 7 21:43:36 2008 +0530
ath9k: Merge structures ath_atx, ath_node_aggr with ath_node
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f6688cd8af6260ad4717ce45d2a614633fcf5540
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Sun Dec 7 21:43:10 2008 +0530
ath9k: Remove remaining occurrences of CONFIG_SLOW_ANT_DIV
Slow Antenna Diversity has been removed, these are remnants
of the old code.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 817e11de2d3392041a70c80a6d5b353ad210f276
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Sun Dec 7 21:42:44 2008 +0530
ath9k: Add a debugfs file to show interrupt statistics
Location: ath9k/<phy>/interrupt
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3706de6f58962ba74c18eb4cb1ebe034ff723037
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Sun Dec 7 21:42:10 2008 +0530
ath9k: Maintain rate table choice after association
A scan run after association would change sc_curmode which is
used to get the current rate table. This patch fixes it
by removing sc_curmode and setting the rate table in usage in cur_rate_table
on association.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 40990ec01fcca0b86a19c13a5d3deb77da1913a7
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Sun Dec 7 21:41:37 2008 +0530
ath9k: Fix bug in rate table management
The proper rate table wouldn't be used if a disassoc
happens and a new attempt is made to associate using
wpa_supplicant. This patch fixes it by storing the rate
table to be used on association.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6b3aa6ab787fe545c58554b7ce5c94de53526b83
Author: Jouni Malinen <j@xxxxx>
Date: Fri Dec 5 20:43:27 2008 +0200
ath9k: Disable staggered Beacon frame scheduling
It looks like there are some issues in the current ath9k version as
far as staggered Beacon frame scheduling is concerned. This results in
Beacon frame timestamp being off by 25 milliseconds or so which can
cause issues with multicast power save buffering in AP mode. Some
client stations fail to receive multicast frames when there is this
large an offset between TBTT and actual Beacon transmission time.
Since ath9k does not yet support multiple BSSes anyway, the staggered
Beacon frame scheduling is just increasing the number of interrupts at
this point. The easiest fix for the timestamp offset is to disable
staggered Beacon frames for now. We need to redesign beacon.c anyway
when adding multi-BSS support with mac80211 since the existing code
depends on different mechanism for Beacon frame transmission.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3fbb9d95a96c6a03f2e484bb1665d089412640dc
Author: Jouni Malinen <j@xxxxx>
Date: Fri Dec 5 20:42:45 2008 +0200
ath9k: Free Beacon skbs in AP mode
Fix a memory leak where AP mode did not free transmitted Beacon frame
skbs.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Acked-by: Pat Erley <pat-lkml@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 61ff84a4ce6451c9a0b675d355e0580e53628801
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Fri Dec 5 18:16:21 2008 +0200
iwlwifi: cleanup (remove pm_state)
This patches removes unused variable (pm_state) from iwl-dev.h and
from iwl-3945.h. (wireless-testing tree)
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a8ec42c1431e8a43f910fb27af4882416cf5d6b1
Author: Zhu, Yi <yi.zhu@xxxxxxxxx>
Date: Fri Dec 5 07:58:41 2008 -0800
iwlwifi: use rmb/wmb to protect indirect mmio operation
This patch protects iwlwifi indirect mmio operations with rmb() and
wmb(). It makes sure CPU reordering won't affect our indirect mmio
access.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 73d7b5acc461bdc99e0135779d15e1874c6e00a6
Author: Zhu, Yi <yi.zhu@xxxxxxxxx>
Date: Fri Dec 5 07:58:40 2008 -0800
iwlwifi: iwl_poll_{direct_}bit cleanup
The patch merges implementation of iwl_poll_bit() and
iwl_poll_direct_bit() by letting the latter be a special case of
the former.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 42802d71dd14dd0e435a8da59d817d0c6f8a2866
Author: Zhu, Yi <yi.zhu@xxxxxxxxx>
Date: Fri Dec 5 07:58:39 2008 -0800
iwlwifi: fix "MAC in deep sleep" error
This patch fixes the misue of CSR_GP_CNTRL with CSR_RESET address
in polling the CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY bit in
iwl4965_apm_reset(). This causes "MAC in deep sleep" error sometimes.
The patch also fixes the timeout value and the iwl_poll_bit() return
value check.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f056658bb9c3085d5ec52fbdd45b38d55b899cc9
Author: Zhu, Yi <yi.zhu@xxxxxxxxx>
Date: Fri Dec 5 07:58:38 2008 -0800
iwlwifi: fix time interval misuse in iwl_poll_{direct_}bit
The patch fixes the misuse of microsecond with millisecond in the
polling mechanism of the iwlwifi driver. The impact of this problem
is the unacceptable latency for the whole system (especially during
bringing down the wlan interface).
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7262796ab726fcefad9b588a44d1d5a9f221051f
Author: Abbas, Mohamed <mohamed.abbas@xxxxxxxxx>
Date: Fri Dec 5 07:58:37 2008 -0800
iwl3945: Fix rate scale for B-mode connection
This patch make sure we use only CCK rate for B only network.
For 3945 driver, it sets REPLY_RATE_SCALE command every time
we connect to a new network. In this command we set for every
rate the number of try and next rate. The problem mac80211 reports
same mode for both B and G mode as IEEE80211_BAND_2GHZ which will cause
using invalid rate other than CCK in B only network. THis patch
on association will examine sta valid rate on association, if no
OFDM rate in valid available rates it considers it as B only mode so
we can set REPLY_RATE_SCALE command with valid B only network and only
choose CCK rate in rate scaling.
Signed-off-by: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 00e540b3768c96a5e2a9d5d39524fef98b2cd981
Author: Halperin, Daniel C <daniel.c.halperin@xxxxxxxxx>
Date: Fri Dec 5 07:58:36 2008 -0800
iwlwifi: implement iwl_debug_report_frame for iwlagn
The old version of this code was copied from 3945 and never updated. This
patch
cleans up structs that do not apply and accounts for other changes from
3945->iwlagn (e.g., PHY info can come in a separate cmd response from the
ucode.)
Signed-off-by: Daniel Halperin <daniel.c.halperin@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 447107fb32d75425c95a33f58e6b4b760b470092
Author: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Date: Thu Dec 4 14:49:08 2008 -0800
mac80211: remove WARN_ON() from ieee80211_hw_config
ieee80211_hw_config can return an error when the hardware
has rfkill enabled. A WARN_ON() is too harsh for this
failure as it is a valid scenario. Only comment this warning
as we would like to have it back when rfkill is integrated into
mac80211.
Also reintroduce propagation of error if ieee80211_hw_config fails
in ieee80211_config_beacon.
This patch partially reverts patch:
5f0387fc3337ca26f0745f945f550f0c3734960f
"mac80211: clean up ieee80211_hw_config errors"
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bb608e9db7d29616fb6e0d856c23434610d4a1bd
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Thu Dec 4 20:38:13 2008 +0530
wireless: Incorrect LEAP authentication algorithm identifier.
This patch fixes a regression introduced by
"wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts"
LEAP authentication algorithm identifier should be 128.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a7db74f4be3835fd16c6c582d320f692ccccc622
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Wed Dec 3 22:21:20 2008 -0600
rtl8187: Improve wireless statistics for RTL8187
The current wireless statistics for the RTL8187 poorly indicate the signal
strength and quality. With testing, I found that the AGC value is inversely
correlated with the strength as in the RTL8187B. By implementing a similar
calculation, much more code becomes common to the two devices.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Tested by: MartÃn Ernesto Barreyro <barreyromartin@xxxxxxxxx>
Acked-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fd28a5b58dddf5cb5df162ae5c8797a63171c31d
Author: Andi Kleen <andi@xxxxxxxxxxxxxx>
Date: Tue Oct 21 14:05:00 2008 +0200
x86: remove simnow earlyprintk support
Impact: remove obsolete code
The later versions of SimNow! actually all have serial console
emulation, so the direct interface isn't needed anymore. So remove
the undocumented simnow earlyprintk console.
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 9470565579f29486f4ed0ffa50774268b64994b0
Author: Dave Jones <davej@xxxxxxxxxx>
Date: Mon Dec 1 14:13:50 2008 -0800
x86: remove init_mm export as planned for 2.6.26
Impact: remove deprecated export
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Tue Dec 9 18:49:51 2008 +0100
sched: add missing arch_update_cpu_topology() call
arch_reinit_sched_domains() used to call arch_update_cpu_topology()
via arch_init_sched_domains(). This call got lost with
e761b7725234276a802322549cee5255305a0930 ("cpu hotplug, sched: Introduce
cpu_active_map and redo sched domain managment (take 2)".
So we might end up with outdated and missing cpus in the cpu core
maps (architecture used to call arch_reinit_sched_domains if cpu
topology changed).
This adds a call to arch_update_cpu_topology in partition_sched_domains
which gets called whenever scheduling domains get updated. Which is
what is supposed to happen when cpu topology changes.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ee79d1bdb6a10499e53f80b1e8d14110215178ba
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Tue Dec 9 18:49:50 2008 +0100
sched: let arch_update_cpu_topology indicate if topology changed
Change arch_update_cpu_topology so it returns 1 if the cpu topology changed
and 0 if it didn't change. This will be useful for the next patch which adds
a call to this function in partition_sched_domains.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2bed8446819a7c5033aa1da138d9f230ae212edc
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 12:13:36 2008 +0100
tracing/function-graph-tracer: add a new .irqentry.text section, fix
Impact: build fix
32-bit x86 needs this section too.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cbc34ed1ac36690f75fd272e19e7b4fc29aae5a2
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Wed Dec 10 08:08:22 2008 +0100
sched: fix tracepoints in scheduler
The trace point only caught one of many places where a task changes cpu,
put it in the right place to we get all of them.
Change the signature while we're at it.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 915b0d0104b72fd36af088ba4b11b5690bc96a6c
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Mon Dec 8 19:19:26 2008 -0800
x86: hardirq: introduce inc_irq_stat()
Impact: cleanup
Introduce inc_irq_stat() macro and unify irq_stat accounting code.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit fd10902797fc9d6abaf55d9c2e3c6698c90b10c7
Merge: 5b3eec0c80038c8739ccd465b897a35c0dff1cc4
8b1fae4e4200388b64dd88065639413cb3f1051c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 11:59:39 2008 +0100
Merge commit 'v2.6.28-rc8' into x86/irq
commit 8f2466f45f75e3cbe3aa2b69d33fd9d6e343b9cc
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Mon Dec 8 19:19:07 2008 -0800
x86: kill #ifdef for exit_idle()
Impact: cleanup
Introduce helper inline function in arch/x86/include/asm/idle.h
to remove #ifdefs around exit_idle().
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 16855f878d7127a8bb3925753463485f3071ad76
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Mon Dec 8 19:18:38 2008 -0800
x86: uaccess: return value of __{get|put}_user() can be int
Impact: cleanup
The type of return value of __{get|put}_user() can be int.
There is no user to refer the return value of __{get|put}_user() as long.
This reduces code size a bit on 64-bit.
$ size vmlinux.*
text data bss dec hex filename
4509265 479988 673588 5662841 566879 vmlinux.new
4511462 479988 673588 5665038 56710e vmlinux.old
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e18d7af85296cb6999aae171e8a9f8612bea5ae0
Merge: 3555105333ae55414d0fe051557bd7dc590f5255
8b1fae4e4200388b64dd88065639413cb3f1051c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 11:53:43 2008 +0100
Merge commit 'v2.6.28-rc8' into x86/mm
commit f8b755ac8e0cc3f330269e4c4504514f987167a2
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Tue Dec 9 23:55:25 2008 +0100
tracing/function-graph-tracer: Output arrows signal on hardirq call/return
Impact: make more obvious the hardirq calls in the output
When a hardirq is triggered inside the codeflow on output, we have
now two arrows that indicate the entry and return of the hardirq.
0) | bit_waitqueue() {
0) 0.880 us | __phys_addr();
0) 2.699 us | }
0) | __wake_up_bit() {
0) ==========> | smp_apic_timer_interrupt() {
0) 0.797 us | native_apic_mem_write();
0) 0.715 us | exit_idle();
0) | irq_enter() {
0) 0.722 us | idle_cpu();
0) 5.519 us | }
0) | hrtimer_interrupt() {
0) | ktime_get() {
0) | ktime_get_ts() {
0) 0.805 us | getnstimeofday();
[...]
0) ! 108.528 us | }
0) | irq_exit() {
0) | do_softirq() {
0) | __do_softirq() {
0) 0.895 us | __local_bh_disable();
0) | run_timer_softirq() {
0) 0.827 us | hrtimer_run_pending();
0) 1.226 us | _spin_lock_irq();
0) | _spin_unlock_irq() {
0) 6.550 us | }
0) 0.924 us | _local_bh_enable();
0) + 12.129 us | }
0) + 13.911 us | }
0) 0.707 us | idle_cpu();
0) + 17.009 us | }
0) ! 137.419 us | }
0) <========== |
0) 1.045 us | }
0) ! 148.908 us | }
0) ! 151.022 us | }
0) ! 153.022 us | }
0) 0.963 us | journal_mark_dirty();
0) 0.925 us | __brelse();
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bcbc4f20b52c2c40c43a4d2337707dcdfe81bc3a
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Tue Dec 9 23:54:20 2008 +0100
tracing/function-graph-tracer: annotate do_IRQ and smp_apic_timer_interrupt
Impact: move most important x86 irq entry-points to a separate subsection
Annotate do_IRQ and smp_apic_timer_interrupt to put them into the
.irqentry.text
subsection. These function will so be recognized as hardirq entrypoints for
the
function-graph-tracer. We could also annotate other irq entries but the
others
are far less important but they can be added on request.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a0343e823184070f55364d8359f832dcb33c57c7
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Tue Dec 9 23:53:16 2008 +0100
tracing/function-graph-tracer: add a new .irqentry.text section
Impact: let the function-graph-tracer be aware of the irq entrypoints
Add a new .irqentry.text section to store the irq entrypoints functions
inside the same section. This way, the tracer will be able to signal
an interrupts triggering on output by recognizing these entrypoints.
Also, make this section recordable for dynamic tracing.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 85072bd55219231b8ca5d9d3fa3492eb4fa6635f
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 11:08:42 2008 +0100
x86, debug: remove EBDA debug printk
Remove leftover EBDA debug message.
Reported-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c1dfdc7597d051b09555d4ae2acb90403e238746
Merge: efbe027e95dc13ac343b6130948418d7ead7ddf1
8b1fae4e4200388b64dd88065639413cb3f1051c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 10:29:35 2008 +0100
Merge commit 'v2.6.28-rc8' into sched/core
commit da485e0cb16726797e99a595a399b9fc721b91bc
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Dec 11 16:14:23 2008 +0100
tracing/fastboot: include missing headers
For now include/trace/boot.h doesn't need to include necessary headers
for its functions and structures because the files that include it already
do it.
But boot.h could be needed as well for further uses on other files.
So, this patch adds the necessary headers for future purposes...
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8001530d5af707eb9a158839c8f651eb6c1cb3c2
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu Dec 11 16:10:08 2008 +0100
tracing/fastboot: fix len of func buffer
Impact: fix possible stack overrun
This is a port of a patch included in the mainline (KSYM_SYMBOL_LEN fixes).
The current func len is not large enough to contain the max symbol len, the
right size must be KSYM_SYMBOL_LEN.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8808500f26a61757cb414da76b271bbd09d5958c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 09:20:12 2008 +0100
x86: soften multi-BAR mapping sanity check warning message
Impact: make debug warning less scary
The ioremap() time multi-BAR map warning has been causing false
positives:
http://lkml.org/lkml/2008/12/10/432
http://lkml.org/lkml/2008/12/11/136
So make it less scary by making it once-per-boot, by making it KERN_INFO
and by adding this text:
"Info: mapping multiple BARs. Your kernel is fine."
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ffc2238af8431d930d2c15f16feecf1fd6d75642
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 08:21:19 2008 +0100
x86, bts: fix build error
Impact: build fix
arch/x86/kernel/ds.c: In function 'ds_request':
arch/x86/kernel/ds.c:236: sorry, unimplemented: inlining failed in call to
'ds_get_context': recursive inlining
but the recursion here is scary ...
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a93751cab71d63126687551823ed3e70cd85854a
Author: Markus Metzger <markut.t.metzger@xxxxxxxxx>
Date: Thu Dec 11 13:53:26 2008 +0100
x86, bts, ftrace: adapt the hw-branch-tracer to the ds.c interface
Impact: restructure code, cleanup
Remove BTS bits from the hw-branch-tracer (renamed from bts-tracer) and
use the ds interface.
Signed-off-by: Markus Metzger <markut.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c2724775ce57c98b8af9694857b941dc61056516
Author: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Date: Thu Dec 11 13:49:59 2008 +0100
x86, bts: provide in-kernel branch-trace interface
Impact: cleanup
Move the BTS bits from ptrace.c into ds.c.
Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit b0884e25fe361f2ca228808fb5fd1b74cb04e711
Author: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Date: Thu Dec 11 13:45:23 2008 +0100
x86, bts: turn BUG_ON into WARN_ON_ONCE
Impact: make the ds code more debuggable
Turn BUG_ON's into WARN_ON_ONCE.
Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f3134de60624829a57741c1f3796847d4de165f6
Merge: e726f5f91effd8944c76475a2688093a03ba0d10
361b73d5c34f59c3fd107bb9dbe7a1fbff2c2517
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 12 07:40:08 2008 +0100
Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer'
into tracing/core
commit 7a3c66e2d322c638e9306e739d96b2192dacde88
Author: Daniel Silverstone <dsilvers@xxxxxxxxxxxx>
Date: Thu Dec 11 21:00:29 2008 -0800
net: Add support for the KS8695 ethernet devices.
Implements the KS8695 ethernet device (ks8695net).
This driver is only of use on the KS8695 which is an ARM9 based SoC. The
documentation on this SoC is sparse and poor, with barely a register
description and a rough outline of how the ethernet works, this driver was
therefore written with strong reference to the Micrel supplied Linux 2.6.9
port, and to Andrew Victor's ks8695eth driver.
Signed-off-by: Daniel Silverstone <dsilvers@xxxxxxxxxxxx>
Signed-off-by: Vincent Sanders <vince@xxxxxxxxxxxx>
Acked-by: Ben Dooks <ben@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 82a9928db560c429807f02467d22394f944a8916
Author: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
Date: Thu Dec 11 20:58:04 2008 -0800
tc35815: Enable StripCRC feature
The chip can strip CRC automatically on receiving. Enable it.
Also fix potential RX_BUF_SIZE calculation bug which was obscured by
alignment. And use proper symbols (NET_IP_ALIGN, ETH_FCS_LEN, etc.)
instead of magic numbers.
Signed-off-by: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2cb377283f3469d66f0ea7358015abfe8366e5d0
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 11 20:54:30 2008 -0800
smsc9420: SMSC LAN9420 10/100 PCI ethernet adapter
This patch adds a driver for the LAN9240 PCI ethernet adapter.
Changes since initial submission:
- debug msg_level has been changed to use standard definitions
- convert to use net_device_ops
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ea943d41a8770857d50029fdc8fd111635c21a1f
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Thu Dec 11 20:34:19 2008 -0800
igb: fixup AER with proper error handling
Based on Peter Waskiewicz patch for ixgbe. Add error handling based on
Hemminger's recommendation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 49d92c7d5bbd158734bc34ed578a68b214a48583
Author: Stanley.Miao <stanley.miao@xxxxxxxxxxxxx>
Date: Thu Dec 11 23:28:10 2008 +0800
ASoC: TWL4030: hands-free start-up sequence.
A special start-up sequence is required to reduce the pop-noise of Class D
amplifier when enable hands-free on TWL4030.
Signed-off-by: Stanley.Miao <stanley.miao@xxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 4544f8a22f38ba4560320fcfbe8c7e81562ddc6f
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 11 16:11:38 2008 +0000
ASoC: Fix variable name for Blackfin I2S DAI
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit cd85400a022335a92fa3c25827179a7ad5e02225
Author: Stefan Roese <sr@xxxxxxx>
Date: Fri Dec 5 01:58:49 2008 +0000
powerpc/4xx: Add L2 cache node to AMCC Canyonlands dts file
With this patch the L2 cache is enabled on Canyonlands to increase the
overall performance. There is a known cache coherency issue with the L2
cache, but this is related to the high bandwidth (HB) PLB segment where
the memory address is 0x8.xxxx.xxxx (low bandwidth PLB segment is mapped
to 0x0.xxxx.xxxx). Since this HB address is currently unused it is safe
to enable the L2 cache.
Signed-off-by: Stefan Roese <sr@xxxxxxx>
Signed-off-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
commit 132bb7c0efe82fc976b06d557f5d63536cb9fdaa
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 11 15:39:52 2008 +0100
ALSA: hda - Add development tree URLs in HD-audio.txt
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit f8bbd06b17f16984328398cdecdf9302ef9bb0bf
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 11 13:12:59 2008 +0100
ALSA: hda - Fix another typo in HD-Audio.txt
commit 42a73df435a23e60d97d9d860f4e55dc9833e950
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 11 12:12:06 2008 +0100
ALSA: sb8 - Fix a return code in the error path
Fixed a compile warning below:
sound/isa/sb/sb8.c: In function â??snd_sb8_probeâ??:
sound/isa/sb/sb8.c:104: warning: â??errâ?? may be used uninitialized in
this function
by setting the return value correctly.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 5c0b9bec460c348d2ee5a800c288e5d0e8fcda66
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 11 11:47:17 2008 +0100
ALSA: hda - Fix a compile warning when CONFIG_PM=n
Fixed the compile warning regarding the unused function when built
with CONFIG_PM=n:
sound/pci/hda/hda_intel.c:1905: warning: â??snd_hda_codecs_inuseâ??
defined but not used
snd_hda_codecs_inuse() is used only in the resume callback.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 6de45d5d776d2a7e7a9adc8ea49d37fe1bd45fb2
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 11 10:28:18 2008 +0100
ALSA: ASoC - Fix DAI registration in s3c2443-ac97.c
Fixed the registration of dais in s3c2443-ac97.c.
sound/soc/s3c24xx/s3c2443-ac97.c: In function 's3c2443_ac97_init':
sound/soc/s3c24xx/s3c2443-ac97.c:401: warning: passing argument 1 of
'snd_soc_register_dai' from incompatible pointer type
sound/soc/s3c24xx/s3c2443-ac97.c: In function 's3c2443_ac97_exit':
sound/soc/s3c24xx/s3c2443-ac97.c:407: warning: passing argument 1 of
'snd_soc_unregister_dai' from incompatible pointer type
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 623b9f6738dee0394398564a74fdabbff00f506f
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 11 07:44:18 2008 +0100
ALSA: hda - Update HD-Audio.txt
Fixed typos and added a section about codecgraph.
Thanks to Vedran MiletiÄ? and Daniel T Chen for suggestions.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 293a4f28333a38aa75254bfb01a5102afc981809
Author: Eric Leblond <eric@xxxxxx>
Date: Wed Dec 10 17:24:33 2008 -0800
netfilter: xt_NFLOG is dependant of nfnetlink_log
The patch "don't call nf_log_packet in NFLOG module" make xt_NFLOG
dependant of nfnetlink_log. This patch forces the dependencies to fix
compilation in case only xt_NFLOG compilation was asked and modifies the
help message accordingly to the change.
Signed-off-by: Eric Leblond <eric@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8229efdaef1e7913ae1712c0ba752f267e5fcd5e
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:30:15 2008 -0800
netns: ip6mr: enable namespace support in ipv6 multicast forwarding code
This last patch makes the appropriate changes to use and propagate the
network namespace where needed in IPv6 multicast forwarding code.
This consists mainly in replacing all the remaining init_net occurences
with current netns pointer retrieved from sockets, net devices or
mfc6_caches depending on the routines' contexts.
Some routines receive a new 'struct net' parameter to propagate the current
netns:
* ip6mr_get_route
* ip6mr_cache_report
* ip6mr_cache_find
* ip6mr_cache_unresolved
* mif6_add/mif6_delete
* ip6mr_mfc_add/ip6mr_mfc_delete
* ip6mr_reg_vif
All the IPv6 multicast forwarding variables moved to struct netns_ipv6 by
the previous patches are now referenced in the correct namespace.
Changelog:
==========
* Take into account the net associated to mfc6_cache when matching entries
in
mfc_unres_queue list.
* Call mroute_clean_tables() in ip6mr_net_exit() to free memory allocated
per-namespace.
* Call dev_net_set() in ip6mr_reg_vif() to initialize dev->nd_net
correctly.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8b90fc7e5b43aaef941044a4785a42439015b539
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:29:48 2008 -0800
netns: ip6mr: declare ip6mr /proc/net entries per-namespace
Declare IPv6 multicast forwarding /proc/net entries per-namespace:
/proc/net/ip6_mr_vif
/proc/net/ip6_mr_cache
Changelog
=========
V2:
* In routine ipmr_mfc_seq_idx(), only match entries belonging to current
netns in mfc_unres_queue list.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 950d5704e5daa1f90bcd75b99163491e7b249169
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:29:24 2008 -0800
netns: ip6mr: declare reg_vif_num per-namespace
Preliminary work to make IPv6 multicast forwarding netns-aware.
Declare variable 'reg_vif_num' per-namespace, moves into struct netns_ipv6.
At the moment, this variable is only referenced in init_net.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a21f3f997c73ced682129aedd372bb6b53041510
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:28:44 2008 -0800
netns: ip6mr: declare mroute_do_assert and mroute_do_pim per-namespace
Preliminary work to make IPv6 multicast forwarding netns-aware.
Declare IPv6 multicast forwarding variables 'mroute_do_assert' and
'mroute_do_pim' per-namespace in struct netns_ipv6.
At the moment, these variables are only referenced in init_net.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4045e57c19bee150370390545ee8a933b3f7a18d
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:27:21 2008 -0800
netns: ip6mr: declare counter cache_resolve_queue_len per-namespace
Preliminary work to make IPv6 multicast forwarding netns-aware.
Declare variable cache_resolve_queue_len per-namespace: moves it into
struct netns_ipv6.
This variable counts the number of unresolved cache entries queued in the
list mfc_unres_queue. This list is kept global to all netns as the number
of entries per namespace is limited to 10 (hardcoded in routine
ip6mr_cache_unresolved).
Entries belonging to different namespaces in mfc_unres_queue will be
identified by matching the mfc_net member introduced previously in
struct mfc6_cache.
Keeping this list global to all netns, also allows us to keep a single
timer (ipmr_expire_timer) to handle their expiration.
In some places cache_resolve_queue_len value was tested for arming
or deleting the timer. These tests were equivalent to testing
mfc_unres_queue value instead and are replaced in this patch.
At the moment, cache_resolve_queue_len is only referenced in init_net.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4a6258a0e33d042e4c84d9dec25d45ddb40a70b3
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:24:07 2008 -0800
netns: ip6mr: dynamically allocate mfc6_cache_array
Preliminary work to make IPv6 multicast forwarding netns-aware.
Dynamically allocates IPv6 multicast forwarding cache, mfc6_cache_array,
and moves it to struct netns_ipv6.
At the moment, mfc6_cache_array is only referenced in init_net.
Replace 'ARRAY_SIZE(mfc6_cache_array)' with mfc6_cache_array size:
MFC6_LINES.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 58701ad41105638baa0b38ffe9ac5b10469c1fd3
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:22:34 2008 -0800
netns: ip6mr: store netns in struct mfc6_cache
This patch stores into struct mfc6_cache the network namespace each
mfc6_cache belongs to. The new member is mfc6_net.
mfc6_net is assigned at cache allocation and doesn't change during
the rest of the cache entry life.
This will help to retrieve the current netns around the IPv6 multicast
forwarding code.
At the moment, all mfc6_cache are allocated in init_net.
Changelog:
==========
* Use write_pnet()/read_pnet() to set and get mfc6_net.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4e16880cb4225bfa68878ad5b2a9ded53657d054
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:15:08 2008 -0800
netns: ip6mr: dynamically allocates vif6_table
Preliminary work to make IPv6 multicast forwarding netns-aware.
Dynamically allocates interface table vif6_table and moves it to
struct netns_ipv6, and updates MIF_EXISTS() macro.
At the moment, vif6_table is only referenced in init_net.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bd91b8bf372911c1e4d66d6bb44fe409349a6791
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 10 16:07:08 2008 -0800
netns: ip6mr: allocate mroute6_socket per-namespace.
Preliminary work to make IPv6 multicast forwarding netns-aware.
Make IPv6 multicast forwarding mroute6_socket per-namespace,
moves it into struct netns_ipv6.
At the moment, mroute6_socket is only referenced in init_net.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5eaa65b240c5eb7bf2235eb9dd177c83e6e3832c
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Wed Dec 10 15:18:31 2008 -0800
net: Make static
Sparse asked whether these could be static.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2107fb8b5bf018be691afdd4c6ffaecf0c3307be
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Wed Nov 5 00:35:38 2008 +0000
smsc911x: add dynamic bus configuration
Convert the driver to select 16-bit or 32-bit bus access at runtime,
at a small performance cost.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3b1228abc93f7ab0aa28c46341d6a0f7e2cade70
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 10 19:27:10 2008 +0000
ASoC: Stop WM8903 SYSCLK when suspending
This will save some additional power.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit d58d5d5567ea9483346f57c83a94ce05992cd47c
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 10 18:36:42 2008 +0000
ASoC: Convert WM8903 driver to register at I2C probe time
The driver now registers the codec and DAI when probed as an I2C device.
Also convert the driver to use a single dynamic allocation to simplify
error handling.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 78e19a39d3985e2a06354493a70a200c0d432de5
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 10 15:38:36 2008 +0000
ASoC: Convert WM8900 to do more work at I2C probe time
Redo the instantiation of the WM8900 to do most of the initialisation
work when the I2C driver probes rather than when the ASoC device is
instantiated, registering the codec with the ASoC core when done.
Also move all dynamic allocations into a single kmalloc() to simplify
error handling and rename the I2C driver to make output more sensible.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit f144b7f6679d9833bd3b94b91e452592b6d0e502
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 17:23:24 2008 +0100
ALSA: cs5535 - Make OLPC-stuff depending on MGEODE_LX
The GPIO stuff for OLPC in cs5535audio_olpc.c is implemented only for
Geode-LX, and enabled only when CONFIG_MGEODE_LX=y. Without this
config option, the driver gets build errors.
This patch adds a workaround to make it dependent on CONFIG_MGEODE_LX.
Ideally, the OLPC-GPIO stuff should be implemented in a way
independent from CPU type selection...
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 0fb497f5b6ff8da1e9e60afb39835f40d7f043ec
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:53:34 2008 -0500
ALSA: cs5535audio: ensure MIC Bias/Analog Input bail if not on an OLPC
machine
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit b5ccc57b06b54058879ab3ea548625d9bf88c7fc
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:53:26 2008 -0500
ALSA: cs5535audio: clean up OLPC code
- add copyright info to _olpc.c
- minor layout fixes
- make Makefile more concise
- silence a warning
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c8f0eeebc119c401202bc2794bec026d6cfd062e
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:53:19 2008 -0500
ALSA: cs5535audio: turn off mic bias on OLPCs by default
Always turn off mic bias; the MIC LED should never come on when the
driver is first loaded.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 01da02419da827742acd5235467f493206e83574
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:53:11 2008 -0500
ALSA: cs5535audio: for OLPC, default to Analog Input being off
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit bf1e5278354856ac0260d338961560e720147681
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:53:03 2008 -0500
ALSA: cs5535audio: rename V_REFOUT control to MIC Bias
This drops the AD1888 V_REFOUT control, and replaces it with a MIC Bias
Enable control. It also moves the MIC bias enabling into a separate
function.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
commit e463ae1d13ffe4943bb31f47cc6f24415e55a59a
Author: Chris Ball <cjb@xxxxxxxxxx>
Date: Thu Nov 6 16:50:09 2008 -0500
ALSA: cs5535audio: enable OLPC's V_REFOUT bias when recording
The OLPC has a privacy light hooked up in series with the microphone's
V_Ref bias. We want to activate the bias while we are capturing audio.
Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 189d34e747e9540b70227f6682bd680868d90b10
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:49:55 2008 -0500
ALSA: cs5535audio: check OLPC's Analog Input status vis GPIO
Checking the HPF register is irrelevant; HPF is secondary to the AI mode.
Instead, check for Analog Input mode via GPIO.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 466ae3055be8665525a5613456fcb387ffef4cb7
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:49:46 2008 -0500
ALSA: cs5535audio: rename OLPC's analog input control && drop AD1888's HPF
Previously, we had two separate controls; there's no need to have AD1888's
HPF control, so drop it if we're on an OLPC machine. Also, as per Arjun's
request, rename OLPC's Analog Input Switch control to "DC Mode Enable".
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit d6276b78028dfab944dd4a58124aefcc9aa580da
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:49:38 2008 -0500
ALSA: cs5535audio: create function for setting OLPC's Analog Input mode
Clean this stuff up a bit..
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 1e2232bc70b32f90109d678d1faccf6f50ebba80
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:47:05 2008 -0500
ALSA: cs5535audio: decouple HPF from V_REFOUT in OLPC code
We shouldn't be touching V_REFOUT when we toggle HPF/analog input, so just
drop that code.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit b91254e75c3ec4f371ce1849672a95a929d99861
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:46:31 2008 -0500
ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff
This is no longer necessary, as we're no longer doing indexed i/o commands.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
commit 3556d18465c6e67c7a8f436428b95671add02f57
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 6 16:44:08 2008 -0500
ALSA: cs5535audio: invert EAPD for OLPC (newer than B3)
Fix an audible pop described in <http://dev.laptop.org/ticket/977>.
Originally
based upon fixes by Mitch Bradley and Chris Ball.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
commit c8974be5465b87414fa542cf9cca1a1ba21b8d60
Author: Jordan Crouse <jordan.crouse@xxxxxxx>
Date: Thu Nov 6 16:43:53 2008 -0500
ALSA: cs5535audio: Use OLPC/Geode basic infrastructure
Use basic infrastructure code; geode_gpio* (rather than indexed i/o
EC access), and do an OLPC machine check in olpc_quirk.
[dilinger@xxxxxxxxxx: don't return failure in olpc_quirks if !OLPC]
[dilinger@xxxxxxxxxx: drop the <B2 workarounds; those machines are EOL'd]
Signed-off-by: Jordan Crouse <jordan.crouse@xxxxxxx>
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
commit 57d4bf6d8e965404b82b105ae44ddf137bb7b8e6
Author: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Date: Thu Nov 6 16:43:34 2008 -0500
ALSA: cs5535audio: OLPC analog input support
This is a 2nd cut at adding support for OLPC analog input.
Signed-off-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
commit b6c52a2cdb58fca918eef9ada5ef3a6cd17a9240
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Wed Nov 5 17:30:30 2008 -0500
ALSA: cs5535audio: suspend/resume callbacks are only defined with CONFIG_PM
snd_cs5535audio_suspend and snd_cs5535audio_resume are only defined when
CONFIG_PM is set; make that clear in the header file.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit b035ce0f26812292d067fbe2fc9e9d88d5dfcdb4
Author: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Date: Wed Nov 5 17:30:08 2008 -0500
ALSA: cs5535audio: turn off PCM properly if closing the audio device
As per <http://dev.laptop.org/ticket/1420>, we need to properly turn off
the PCM if we're closing the device in order to save power. This also
causes the MIC led to turn off properly.
Signed-off-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 0bed7b292d68f82316bfb8cd521e16c867689efe
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Wed Nov 5 17:29:53 2008 -0500
ALSA: cs5535audio: stick AD1888 bitshift values into a header file
We'd like to use the High Pass Filter and V_REFOUT bitshift values
elsewhere,
so stick them into a ac97_codec.h.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 0d0cf00a7fc63cee9a4c4a3b8612879b4f7f42ba
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 10 14:32:45 2008 +0000
ASoC: Add codec registration API
Another part of the backporting of Liam's ASoC v2 work. Using this is
more complicated than the other registration types since currently the
codec is instantiated during the probe of the ASoC device so we can't
currently readily wait for the codec to register.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit cdc693643271b2e6a693cf8f6afb258cce01f058
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 10 13:55:49 2008 +0000
ALSA: Add support for mechanical jack insertion
Some systems support both mechanical and electrical jack detection,
allowing them to report that a jack is physically present but does
not have any functioning connections. Add a new jack type for these,
allowing user space to report faulty connections.
Thanks to Guillem Jover for the suggestion.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 1e5fa31f96d558e53fe80e943305104bf4339711
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Wed Dec 10 12:51:48 2008 +0200
ASoC: TWL4030: Change the name for the DACs
To avoid confusion the names for the DACs changed:
DACL1 -> DAC Left1
...
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit d4a73131a56e906b8f65e20934516adcad68b524
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Wed Dec 10 12:51:47 2008 +0200
ASoC: TWL4030: Small cleanup
The mux switch related texts fits to on line, no need to wrap
them.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 6a1bee4a9cae13aa73abd8f724bada213a38eb63
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Wed Dec 10 12:51:46 2008 +0200
ASoC: TWL4030: Add missing Carkit output
SND_SOC_DAPM_OUTPUT definition for carkitL/R was missing.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 1e297a19252a6792c4479b300020f7f63eeb56ef
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 10 11:08:33 2008 +0000
ASoC: Work around warnings from some build environments
BUG() should be marked as not returning but for at least some
configurations (including some widely deployed compilers) that's either
not happening or being forgotten by the compiler. Add some extra return
statements to the affected paths.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 11d518e07d700eeb5bcec36bfd5f501e405230dd
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 10:37:33 2008 +0100
ALSA: hda - Add quirk for HP6730B laptop
Added model=laptop for HP 6730B laptop with AD1984A codec.
Reference: Novell bnc#457909
https://bugzilla.novell.com/show_bug.cgi?id=457909
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Cc: stable@xxxxxxxxxx
commit 6fabd715e6d8e1b37c0c66d9bfda2c19643e3f77
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Wed Dec 10 01:13:08 2008 -0800
ixgbe: Implement PCIe AER support
This patch implements the PCIe Advanced Error Reporting callbacks in
ixgbe. The 82598 hardware supports AER, so we enable it.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5e8427e5e25e3f844113cf67d07e7806bbe8c0e2
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Wed Dec 10 01:09:53 2008 -0800
igb: Correctly determine pci-e function number in virtual environment
When running in a virtual environment the ports of an 82575/6 can appear to
be single function devices which is not correct. To resolve this we rely
on the function number stored in the status register.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b4557be23dc959f38eed21d359ec7164e42bcbd6
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Wed Dec 10 01:08:59 2008 -0800
igb: update handling of RCTL for smaller buffer sizes
As we begin to move into virtualization the use of a global value for
buffer sizes becomes undesirable. This change makes it so only 256 and 512
byte buffers require use of the RCTL register.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d2afbe78a2922929ad44882d3583d938b9949a30
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 09:28:15 2008 +0100
ALSA: hda - Update documentation
Minor typo-fixes and improvements on HD-Audio.txt.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 44411e07c2ce1a755a756e10b592cd3ba02f99b3
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 08:27:19 2008 +0100
ALSA: ca0106 - Check return value of pci_enable_device() in resume
The return value of pci_enable_device() must be checked even in resume
callback:
sound/pci/ca0106/ca0106_main.c:1779: warning: ignoring return value of
â??pci_enable_deviceâ??, declared with attribute warn_unused_result
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit e97fd7c6d51d8bf32ce981b853d987cfc6bdfb7f
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:10:38 2008 -0800
bonding: turn all bond_parm_tbls const
Turn all bond_parm_tbls const.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 325dcf7a907a43f8832b92ae1c672798b4e60ce2
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:10:17 2008 -0800
bonding: make tbl argument to bond_parse_parm() const
bond_parse_parm() parses a parameter table for a particular value and
is therefore not modifying the table at all. Therefore make the 2nd
argument const, thus allowing to make the tables const later.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d78755237f0892c8d313a7f7b1774443a7308b11
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:09:49 2008 -0800
bonding: remove duplicate declarations
Remove some declarations from bonding.c as they are declared in bonding.h
already.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5a03cdb7f2d7ff88e50153d8c3b90a1d52dca435
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:09:22 2008 -0800
bonding: use pr_debug instead of own macros
Use pr_debug() instead of own macros.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ef65583d01f4060c758dba72f08edc09d8faa719
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:08:55 2008 -0800
bonding: fix compile error if debug enabled
This is what I get if debug is enabled:
drivers/net/bonding/bond_ipv6.c: In function 'bond_na_send':
drivers/net/bonding/bond_ipv6.c:75: error: 'slave' undeclared (first use in
this function)
drivers/net/bonding/bond_ipv6.c:75: error: (Each undeclared identifier is
reported only once
drivers/net/bonding/bond_ipv6.c:75: error: for each function it appears in.)
This patch fixes that.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 77afc92b7915b6bb21584474a429a04603ac8963
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:08:09 2008 -0800
bonding: use table for mode names
Use a small array in bond_mode_name() for the names, thus saving some
space:
before
text data bss dec hex filename
57736 9372 344 67452 1077c drivers/net/bonding/bonding.ko
after
text data bss dec hex filename
57441 9372 344 67157 10655 drivers/net/bonding/bonding.ko
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 58402054264fa33b405d1abcbcd8e528507aac1a
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Tue Dec 9 23:07:13 2008 -0800
bonding: add and use bond_is_lb()
Introduce and use bond_is_lb(), it is usefull to shorten the repetitive
check for either ALB or TLB mode.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f73f2a6a23e34de9cca9672f727694e5af00e6c7
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 07:59:33 2008 +0100
ALSA: ASoC - Fix symbol conflicts in omac-mcbsp.c
Add snd_ prefix to avoid the conflict of symbols in omac-mcbsp.c:
sound/soc/omap/omap-mcbsp.c:503: error: static declaration of
'omap_mcbsp_init' follows non-static declaration
arch/arm/plat-omap/include/mach/mcbsp.h:373: error: previous declaration
of 'omap_mcbsp_init' was here
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit acc421656b97f09b55acb0938ad5378eefa5aacc
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Tue Dec 9 23:26:05 2008 +0100
ALSA: sound: Make static
Sparse asked whether these could be static.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c9b3a40ff2b3dea9914e36965a17c802650bb603
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 07:47:22 2008 +0100
ALSA: ASoC - Fix wrong section types
The module init entries should be __init instead of __devinit.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 24e07db8cceb7dfe2d4005e4450a27f4bcda6499
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 10 07:40:24 2008 +0100
ALSA: ASoC - Fix module init entry for twl4030.c
Fixed the function name of module init entry for twl4030.c, which
conflicted with the existing hardware init function:
sound/soc/codecs/twl4030.c:1278: error: conflicting types for
'twl4030_init'
sound/soc/codecs/twl4030.c:1187: error: previous definition of
'twl4030_init' was here
Also fixed the section type of init function.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 512bb43eb5422ee69a1be05ea0d89dc074fac9a2
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Tue Dec 9 22:35:02 2008 -0800
pkt_sched: sch_htb: Optimize WARN_ONs in htb_dequeue_tree() etc.
We can skip WARN_ON() in htb_dequeue_tree() because there should be
always a similar warning from htb_lookup_leaf() earlier.
The first WARN_ON() in in htb_lookup_leaf() is changed to BUG_ON()
because most likly this should end with oops anyway.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1b5c0077e1615bb16e777a10ec1fc1195ba059ac
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Tue Dec 9 22:34:40 2008 -0800
pkt_sched: sch_htb: Optimize htb_find_next_upper()
htb_id_find_next_upper() is usually called to find a class with next
id after some previously removed class, so let's move a check for
equality to the end: it's the least likely here.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dbb7a95d810ab76aac42e1a5cefdf069dcd014a1
Author: Chaithrika U S <chaithrika@xxxxxx>
Date: Tue Dec 9 22:21:25 2008 -0800
phy: Add LSI ET1011C PHY driver
Adds LSI ET1011C PHY driver.
This driver is used by TI DM646x EVM.
Signed-off-by: Chaithrika U S <chaithrika@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 471716f7ea646487b7b5c7b3efc68a023b05a933
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 9 14:47:07 2008 +0000
ASoC: Fix typos in Atmel module registration
I wish I had boards which work with unmodified kernels :/
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit f0752331b89ce79063f765545dd7dd5f49d9a713
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 9 12:51:56 2008 +0000
ASoC: Convert WM8900 to allow registration by machine code
This makes use of the support for delayed DAI registration to allow the
WM8900 I2C device to be registered by general platform/architecture code
rather than as part of the ASoC device probe.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 6b05eda6383d89bffc21da654d148733e7839540
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 8 19:26:48 2008 +0000
ASoC: Wait for non-AC97 codec DAIs before instantiating
This will allow codec drivers to be refactored to allow them to be
registered out of line with the ASoC device registration.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 435c5e2588893e3f7aba0bd4de67991bf00b3c9d
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 4 15:32:53 2008 +0000
ASoC: Initial framework for dynamic card instantiation
Use the lists of platforms, platform DAIs and cards to check to see that
everything has registered. Since relationships are still specified by
direct references to the structures in the drivers and the drivers all
register everything at modprobe there should be no practical effect yet.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 64089b84abfe2f26a864ebd968429302dcb071de
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 8 19:17:58 2008 +0000
ASoC: Register non-AC97 codec DAIs
Currently this is done at module probe time since ASoC ties in codec
device probe to the instantiation of the entire ASoC device. Subsequent
patches will refactor the codec drivers to handle probing separately.
Note that the core does not yet use this information.
AC97 is special since the codec is controlled over the AC97 link but
we want to give the machine driver a chance to set up the system before
trying to instantiate since it may need to do configuration before the
AC97 link will operate
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 958e792c7c8f06a9e666adb0ed94fff2cf90156f
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 19:58:17 2008 +0000
ASoC: Register platform drivers
This is done at modprobe time, mirroring current behaviour, except for
mpc5200_psc_i2s where we do registration at the same time as we register
with soc-of-simple. Since the core currently ignores registration this
has no practical impact.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 12a48a8c0087ba39d926cf1d63938ccbdb9752c3
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 19:40:30 2008 +0000
ASoC: Add platform registration API
ASoC v2 allows platform drivers to instantiate independantly of the
overall ASoC card. This API allows drivers to notify the core when
they are registered.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 3f4b783cfdebb559814690572041a17bc9744cf3
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 19:26:35 2008 +0000
ASoC: Register platform DAIs
Register all platform DAIs with the core. In line with current behaviour
this is done at module probe time rather than when the devices are probed
(since currently that only happens as the entire ASoC card is registered
except for those drivers that currently implement some kind of hotplug).
Since the core currently ignores DAI registration this has no practical
effect.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 9115171a6b79b6b4d5c6697f123556b6efc37f1f
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Sun Nov 30 23:31:24 2008 +0000
ASoC: Add DAI registration API
Add API calls to register and unregister DAIs with the core. Currently
these APIs are ineffective. Since multiple DAIs for a given device are
a common case bulk variants are provided.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit c5af3a2e192d333997d1e191f3eba7fd2f869681
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 28 13:29:45 2008 +0000
ASoC: Add card registration API
ASoC v2 allows cards, codecs and platforms to instantiate separately,
with the overall ASoC device only being instantiated once all the
required components have registered. As part of backporting Liam's work
introduce an initial version of the card registration functions. At
present these do nothing active and are internal only, they will be
exposed to machine drivers after further backporting. Adding this now
allows the datastructures used for dynamic card instantiation to be
built up gradually.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit ca4513fe06c483bf0111c990059d42f97288605d
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:52 2008 +0200
ASoC: TWL4030: Do not alter the Headset output volume on power-up/down
There is a separate gain control for the Headset output already.
Do not reset the gain to 0 dB at power up.
In power-down, there is no need to set the Headset output gain
to power-down mode, since if the CODECPDZ is in powered off this
setting has no effect.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit df339804bbfc118eaca066b95488a2dbacc2e258
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:51 2008 +0200
ASoC: TWL4030: DAPM mapping of the Handsfree outputs
Adds DAPM muxing, routing for the Handsfree outputs.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 5152d8c28b95e421b91483ca0df76726e6e6c41e
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:50 2008 +0200
ASoC: TWL4030: DAPM mapping of the Carkit outputs
Adds DAPM muxing, routing for the Carkit outputs.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit dfad21a26f5b3cc379fbec9c5d12b5106dd1f9c5
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:49 2008 +0200
ASoC: TWL4030: DAPM mapping of the Headset outputs
Adds DAPM muxing, routing for the Headset outputs.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 2a6f5c5892dcd17c81204fe5e26b92a37d2daafa
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:48 2008 +0200
ASoC: TWL4030: DAPM mapping of the PreDriv outputs
Adds DAPM muxing, routing for the PreDrive outputs.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 5e98a46449cd028b9b97a8ef2c2448c8f473d6c5
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:47 2008 +0200
ASoC: TWL4030: DAPM mapping of the Earpiece output
Adds DAPM muxing, routing for the Earpiece output.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit e8ff9c417ad6e8f7ef253e36f9d6e22dc2aa2512
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 12:35:46 2008 +0200
ASoC: TWL4030: Add DAPM event handler for output MUX selection
DAPM event handler is set to filter out invalid MUX settings
for certain outputs.
Earpiece:
- 0 = Off
- 1 = DACL1
- 2 = DACL2
- 3 = *** Invalid ***
- 4 = DACR1
PreDriveL/R:
- 0 = Off/Off
- 1 = DACL1/DACR1
- 2 = DACL2/DACR2
- 3 = *** Invalid/Invalid ***
- 4 = DACR2/DACL2
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 44c5587035fbbdd368a3d5d8d11997d43758078a
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 08:45:44 2008 +0200
ASoC: TWL4030: Add Analog PGA control switch to DAPM
Add all four APGA switch to DAPM routing and widgets.
Add user control for DA enable for all APGA as normal
control.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 53b5047d994edfcafabc0e95bb681ae70d6e8604
Author: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Date: Tue Dec 9 08:45:43 2008 +0200
ASoC: TWL4030: Correct DAPM_DAC with power control
Add all four DACs to dapm_widgets with power switch.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 1e641743f055f075ed9a4edd75f1fb1e05669ddc
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 9 09:23:33 2008 +0000
Audit: Log TIOCSTI
AUDIT_TTY records currently log all data read by processes marked for
TTY input auditing, even if the data was "pushed back" using the TIOCSTI
ioctl, not typed by the user.
This patch records all TIOCSTI calls to disambiguate the input. It
generates one audit message per character pushed back; considering
TIOCSTI is used very rarely, this simple solution is probably good
enough. (The only program I could find that uses TIOCSTI is mailx/nail
in "header editing" mode, e.g. using the ~h escape. mailx is used very
rarely, and the escapes are used even rarer.)
Signed-Off-By: Miloslav Trmac <mitr@xxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit e19caae7177fcc732ae1b47135e39f577352adb2
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 9 01:04:27 2008 -0800
bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().
As Stephen Rothwell points out, we don't want 'sock' here but
rather we really do want 'sk'.
This local var is protected by all sorts of bluetooth debugging
kconfig vars, but BT_DBG() is just a straight pr_debug() call
which is unconditional.
pr_debug() evaluates it's args only if either DEBUG or
CONFIG_DYNAMIC_PRINTK_DEBUG is defined.
Solving this inside of the BT_DBG() macro is non-trivial since
it's varargs. And these ifdefs are ugly.
So, just mark this 'sk' thing __maybe_unused and kill the ifdefs.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bcb09dc276e706ed6f22813ba774797125f3da0a
Author: Brice Goglin <brice@xxxxxxxx>
Date: Tue Dec 9 00:14:27 2008 -0800
myri10ge: check fragmentation in LRO get_frag_header()
Add a fragmentation check to myri10ge's LRO get_frag_header() callback.
Signed-off-by: Brice Goglin <brice@xxxxxxxx>
Signed-off-by: Andrew Gallatin <gallatin@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6cf1a0f856bcb5423bfb4121b2dfeaa3ba7b1ff2
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 9 00:01:53 2008 -0800
bluetooth: Fix rfcomm_sock_ioctl() build failure with debugging enabled.
It's 'sock' not 'sk'.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e42130039c85826567d4e4864f2c7492578576cb
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Mon Dec 8 23:50:18 2008 -0800
hydra: fix compilation
drivers/net/hydra.c:163: error: 'hydra_netdev_ops' undeclared (first use in
this function)
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 30bc4481de890e97dc001ee123761d89638cbc50
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue Dec 9 08:23:45 2008 +0100
ALSA: Updates about bug-reporting in ALSA-Configuration.txt
Updated the information about bug-reporting for HD-audio.
Mentioned alsa-info.sh and kernel bugzilla. Removed ALSA BTS address
not to flood the unhandled reports any more.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 94d6a5f7341ebaff53d4e41cc81fab37f0d9fbed
Author: Serge E. Hallyn <serue@xxxxxxxxxx>
Date: Mon Dec 8 15:52:21 2008 -0600
user namespaces: document CFS behavior
Documented the currently bogus state of support for CFS user groups with
user namespaces. In particular, all users in a user namespace should be
children of the user which created the user namespace. This is yet to
be implemented.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Acked-by: Dhaval Giani <dhaval@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit e726f5f91effd8944c76475a2688093a03ba0d10
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Dec 8 16:55:53 2008 +0100
tracing/function-graph-tracer: fix 'flags' variable mismatch
this warning:
kernel/trace/trace.c: In function â??trace_vprintkâ??:
kernel/trace/trace.c:3626: warning: â??flagsâ?? may be used uninitialized
in this function
shows some confusion about irq_flags / flags use here. We already have
irq_flags so remove the extra flags variable.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit efbe027e95dc13ac343b6130948418d7ead7ddf1
Author: Vaidyanathan Srinivasan <svaidy@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 8 20:52:49 2008 +0530
sched: idle_balance() does not call load_balance_newidle()
Impact: fix SD_BALANCE_NEWIDLEand broaden its use
load_balance_newidle() does not get called if SD_BALANCE_NEWIDLE is
set at higher level domain (3-CPU) and not in low level domain (2-MC).
pulled_task is initialised to -1 and checked for non-zero which is
always true if the lowest level sched_domain does not have
SD_BALANCE_NEWIDLE flag set.
Signed-off-by: Vaidyanathan Srinivasan <svaidy@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 4217458dafaa57d8e26a46f5d05ab8c53cf64191
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Date: Fri Dec 5 17:17:09 2008 -0800
x86: signal: change type of paramter for sys_rt_sigreturn()
Impact: cleanup on 32-bit
Peter pointed this parameter can be changed.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 380c4b1411ccd6885f92b2c8ceb08433a720f44e
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Sat Dec 6 03:43:41 2008 +0100
tracing/function-graph-tracer: append the tracing_graph_flag
Impact: Provide a way to pause the function graph tracer
As suggested by Steven Rostedt, the previous patch that prevented from
spinlock function tracing shouldn't use the raw_spinlock to fix it.
It's much better to follow lockdep with normal spinlock, so this patch
adds a new flag for each task to make the function graph tracer able
to be paused. We also can send an ftrace_printk whithout worrying of
the irrelevant traced spinlock during insertion.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8e1b82e0866befaa0b2920be296c6e4c3fc7f422
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Sat Dec 6 03:41:33 2008 +0100
tracing/function-graph-tracer: turn tracing_selftest_running into an int
Impact: cleanup
Apply some suggestions of Steven Rostedt:
_turn tracing_selftest_running into a simple int (no need of an atomic_t)
_set it __read_mostly
_fix a comment style
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8b96f0119818964e4944fd1c423bf6770027d3ac
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Sat Dec 6 03:40:00 2008 +0100
tracing/function-graph-tracer: introduce __notrace_funcgraph to filter
special functions
Impact: trace more functions
When the function graph tracer is configured, three more files are not
traced to prevent only four functions to be traced. And this impacts the
normal function tracer too.
arch/x86/kernel/process_64/32.c:
I had crashes when I let this file traced. After some debugging, I saw
that the "current" task point was changed inside__swtich_to(), ie:
"write_pda(pcurrent, next_p);" inside process_64.c Since the tracer store
the original return address of the function inside current, we had
crashes. Only __switch_to() has to be excluded from tracing.
kernel/module.c and kernel/extable.c:
Because of a function used internally by the function graph tracer:
__kernel_text_address()
To let the other functions inside these files to be traced, this patch
introduces the __notrace_funcgraph function prefix which is __notrace if
function graph tracer is configured and nothing if not.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 69b88afa8d114a43a3c0431722b79e31d9920692
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Fri Dec 5 22:45:50 2008 -0800
x86: clean up get_smp_config()
Impact: cleanup
reorder exit path in __get_smp_config().
also move two print outs to acpi_process_madt
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit aa9c9b8c584a42a094202b7e0f63497e888f86a7
Merge: 87f7606591aea6a8a38ea4c8911b5eeeee2740b8
218d11a8b071b23b76c484fd5f72a4fe3306801e
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Dec 8 15:07:49 2008 +0100
Merge branch 'linus' into x86/quirks
commit 361b73d5c34f59c3fd107bb9dbe7a1fbff2c2517
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Date: Mon Dec 8 10:58:08 2008 +0800
ring_buffer: fix comments
Impact: comments cleanup
fix incorrect comments for enum ring_buffer_type
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5436499e6098759c2340f8b906ea52f993dc4efb
Author: Ken Chen <kenchen@xxxxxxxxxx>
Date: Sun Dec 7 18:47:37 2008 -0800
sched: fix sd_parent_degenerate on non-numa smp machine
Impact: optimize the sched domains tree some more
The addition of SD_SERIALIZE flag added to SD_NODE_INIT prevented top level
dummy numa sched_domain to be properly degenerated on non-numa smp machine.
The reason is that in sd_parent_degenerate(), it found that the child and
parent does not have comon sched_domain flags due to SD_SERIALIZE. However,
for non-numa smp box, the top level is a dummy with a single sched_group.
Filter out SD_SERIALIZE if it is on non-numa machine to properly degenerate
top level node sched_domain. this will cut back some of the sd domain walk
in the load balancer code.
Signed-off-by: Ken Chen <kenchen@xxxxxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 4d117c5c6b00254e51c61ff5b506ccaba21a5a03
Merge: 6c415b9234a8c71f290e5d4fddc467f103f32719
43714539eab42b2fa3653ea7bd667b36c2291b11
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Dec 8 13:52:00 2008 +0100
Merge branch 'sched/urgent' into sched/core
commit 3e1e9002aa8b32bd4c95ac6c8fad376b7a8127fb
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Mon Dec 8 00:50:22 2008 +0100
x86: change static allocation of trampoline area
Impact: fix trampoline sizing bug, save space
While debugging a suspend-to-RAM related issue it occured to me that
if the trampoline code had grown past 4 KB, we would have been
allocating too little memory for it, since the 4 KB size of the
trampoline is hardcoded into arch/x86/kernel/e820.c . Change that
by making the kernel compute the trampoline size and allocate as much
memory as necessary.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit decbec3838d10ecd7aabdb4c0e05aac0e5f5dc0c
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Mon Dec 8 01:56:06 2008 +0100
tracing/function-graph-tracer: implement a print_headers function
Impact: provide trace headers to explain a bit the output
This patch implements the print_headers callback for the function graph
tracer. These headers are output according to the current trace options.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5e03c54eeb016cf1b066e9e48d30116814ca2459
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Mon Dec 8 12:40:56 2008 +0100
ALSA: hrtimer - Use hard-irq callback
Use the hard-irq mode for the callback (for possible removal of
soft-irq mode in future).
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 647808a6b932d85c3e85df6dcf0e34c1e53cc953
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Mon Dec 8 12:16:58 2008 +0100
ALSA: timer - Add comments and use ns_to_ktime()
Add the license and misc comments at the beginning of the code.
Also, use ns_to_ktime() for simplification.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 6fdd34d43bff8be9bb925b49d87a0ee144d2ab07
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:19:06 2008 -0800
dccp ccid-2: Phase out the use of boolean Ack Vector sysctl
This removes the use of the sysctl and the minisock variable for the Send
Ack
Vector feature, as it now is handled fully dynamically via feature
negotiation
(i.e. when CCID-2 is enabled, Ack Vectors are automatically enabled as per
RFC 4341, 4.).
Using a sysctl in parallel to this implementation would open the door to
crashes, since much of the code relies on tests of the boolean minisock /
sysctl variable. Thus, this patch replaces all tests of type
if (dccp_msk(sk)->dccpms_send_ack_vector)
/* ... */
with
if (dp->dccps_hc_rx_ackvec != NULL)
/* ... */
The dccps_hc_rx_ackvec is allocated by the dccp_hdlr_ackvec() when feature
negotiation concluded that Ack Vectors are to be used on the
half-connection.
Otherwise, it is NULL (due to dccp_init_sock/dccp_create_openreq_child),
so that the test is a valid one.
The activation handler for Ack Vectors is called as soon as the feature
negotiation has concluded at the
* server when the Ack marking the transition RESPOND => OPEN arrives;
* client after it has sent its ACK, marking the transition REQUEST =>
PARTOPEN.
Adding the sequence number of the Response packet to the Ack Vector has been
removed, since
(a) connection establishment implies that the Response has been received;
(b) the CCIDs only look at packets received in the (PART)OPEN state, i.e.
this entry will always be ignored;
(c) it can not be used for anything useful - to detect loss for instance,
only
packets received after the loss can serve as pseudo-dupacks.
There was a FIXME to change the error code when dccp_ackvec_add() fails.
I removed this after finding out that:
* the check whether ackno < ISN is already made earlier,
* this Response is likely the 1st packet with an Ackno that the client
gets,
* so when dccp_ackvec_add() fails, the reason is likely not a packet error.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4098dce5be537a157eed4a326efd464109825b8b
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:18:37 2008 -0800
dccp: Remove manual influence on NDP Count feature
Updating the NDP count feature is handled automatically now:
* for CCID-2 it is disabled, since the code does not use NDP counts;
* for CCID-3 it is enabled, as NDP counts are used to determine loss
lengths.
Allowing the user to change NDP values leads to unpredictable and failing
behaviour, since it is then possible to disable NDP counts even when they
are needed (e.g. in CCID-3).
This means that only those user settings are sensible that agree with the
values for Send NDP Count implied by the choice of CCID. But those settings
are already activated by the feature negotiation (CCID dependency tracking),
hence this form of support is redundant.
At startup the initialisation of the NDP count feature uses the default
value of 0, which is done implicitly by the zeroing-out of the socket when
it is allocated. If the choice of CCID or feature negotiation enables NDP
count, this will then be updated via the NDP activation handler.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0049bab5e765aa74cf767a834fa336e19453fc5e
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:18:05 2008 -0800
dccp: Remove obsolete parts of the old CCID interface
The TX/RX CCIDs of the minisock are now redundant: similar to the Ack Vector
case, their value equals initially that of the sysctl, but at the end of
feature negotiation may be something different.
The old interface removed by this patch thus has been replaced by the newer
interface to dynamically query the currently loaded CCIDs.
Also removed are the constructors for the TX CCID and the RX CCID, since the
switch "rx <-> non-rx" is done by the handler in minisocks.c (and the
handler
is the only place in the code where CCIDs are loaded).
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 63b8e2861f31868dce9c92fd7444f212a5a8a775
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:17:32 2008 -0800
dccp: Clean up old feature-negotiation infrastructure
The code removed by this patch is no longer referenced or used, the added
lines update documentation and copyrights.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 991d927c8652b2ab51bd8eef2b773bb2c77d457b
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:16:27 2008 -0800
dccp: Integration of dynamic feature activation - part 3 (client side)
This integrates feature-activation in the client:
1. When dccp_parse_options() fails, the reset code is already set;
request_sent\
_state_process() currently overrides this with `Packet Error', which is
not
intended - changed to use the reset code supplied by
dccp_parse_options().
2. When feature negotiation fails, the socket should be marked as not
usable,
so that the application is notified that an error occurred. This is
achieved
by a new label 'unable_to_proceed': generating an error code of
`Aborted',
setting the socket state to CLOSED, returning with ECOMM in sk_err.
3. Avoids parsing the Ack twice in Respond state by not doing option
processing
again in dccp_rcv_respond_partopen_state_process (as option processing
has
already been done on the request_sock in dccp_check_req).
Since this addresses congestion-control initialisation, a corresponding
FIXME has been removed.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 192b27ff35bad4cf76cc4239419e9f805935e4f8
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:15:55 2008 -0800
dccp: Integration of dynamic feature activation - part 2 (server side)
This patch integrates the activation of features at the end of negotiation
into the server-side code.
Note regarding the removal of 'const':
--------------------------------------
The 'const' attribute has been removed from 'dreq' since
dccp_activate_values()
needs to operate on dreq's feature list. Part of the activation is to
remove
those options from the list that have already been confirmed, hence it is
not
purely read-only.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6eb55d172b5f6de65afdae6285f8d732e4785bf7
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:15:26 2008 -0800
dccp: Integration of dynamic feature activation - part 1 (socket setup)
This first patch out of three replaces the hardcoded default settings with
initialisation code for the dynamic feature negotiation.
The patch also ensures that the client feature-negotiation queue is flushed
only when entering the OPEN state.
Since confirmed Change options are removed as soon as they are confirmed
(in the DCCP-Response), this ensures that Confirm options are retransmitted.
Note on retransmitting Confirm options:
---------------------------------------
Implementation experience showed that it is necessary to retransmit Confirm
options. Thanks to Leandro Melo de Sales who reported a bug in an earlier
revision of the patch set, resulting from not retransmitting these options.
As long as the client is in PARTOPEN, it needs to retransmit the Confirm
options for the Change options received on the DCCP-Response from the
server.
Otherwise, if the packet containing the Confirm options gets dropped in the
network, the connection aborts due to undefined feature negotiation state.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Acked-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b74ca3a896b9ab5f952bc440154758e708c48884
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:14:16 2008 -0800
netdevice: Kill netdev->priv
This is the last shoot of this series.
After I removing all directly reference of netdev->priv, I am killing
"priv" of "struct net_device" and fixing relative comments/docs.
Anyone will not be allowed to reference netdev->priv directly.
If you want to reference the memory of private data, use netdev_priv()
instead.
If the private data is not allocted when alloc_netdev(), use
netdev->ml_priv to point that memory after you creating that private
data.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5a001a070e032bea1be563b13ebf9819cd5e54d4
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Mon Dec 8 01:13:25 2008 -0800
staging-winbond: Kill directly reference of netdev->priv
This driver is not yet finished.
At this time, we don't know how netdev be created and how
private data be allocated.
So, simply use netdev_priv() now and leave some temp comment.
Compile test only.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7657d90497f98426af17f0ac633a9b335bb7a8fb
Author: Serge E. Hallyn <serue@xxxxxxxxxx>
Date: Wed Dec 3 13:17:33 2008 -0600
user namespaces: require cap_set{ug}id for CLONE_NEWUSER
While ideally CLONE_NEWUSER will eventually require no
privilege, the required permission checks are currently
not there. As a result, CLONE_NEWUSER has the same effect
as a setuid(0)+setgroups(1,"0"). While we already require
CAP_SYS_ADMIN, requiring CAP_SETUID and CAP_SETGID seems
appropriate.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Acked-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit c37bbb0fdcc01610fd55604eb6927210a1d20044
Author: Serge E. Hallyn <serue@xxxxxxxxxx>
Date: Wed Dec 3 13:17:06 2008 -0600
user namespaces: let user_ns be cloned with fairsched
(These two patches are in the next-unacked branch of
git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6.
If they get some ACKs, then I hope to feed this into security-next.
After these two, I think we're ready to tackle userns+capabilities)
Fairsched creates a per-uid directory under /sys/kernel/uids/.
So when you clone(CLONE_NEWUSER), it tries to create
/sys/kernel/uids/0, which already exists, and you get back
-ENOMEM.
This was supposed to be fixed by sysfs tagging, but that
was postponed (ok, rejected until sysfs locking is fixed).
So, just as with network namespaces, we just don't create
those directories for user namespaces other than the init.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 32e176c14d7a425b681ef003c9061001ddb7fc7b
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sat Dec 6 15:09:08 2008 +0100
Sound: hda - Restore PCI configuration space with interrupts off
Move the restoration of the standard PCI configuration registers
in the snd_hda_intel driver to a ->resume_early() callback executed
with interrupts disabled, since doing that with interrupts enabled
may lead to problems in some cases.
This patch addresses the regression from 2.6.26 tracked as
http://bugzilla.kernel.org/show_bug.cgi?id=12121 .
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 4bcd42679643dd3dfd6aaad9fcbcc74ac5c7e2e9
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Sat Dec 6 23:59:10 2008 -0800
staging-slicoss: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 979123d5343b4fdcd4c682745b8a0be9b8fac248
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Sat Dec 6 23:58:37 2008 -0800
staging-p80211: Kill directly reference of netdev->priv
In this driver, netdev's private data is wlandevice_t. And the
wlandev(type of wlandevice_t) is exist before netdev be allocated. So
use netdev->ml_priv to point to the private data.
I am not sure whether I should consider the kernel version older than
2.3.38. Because in those kernels, netdevice_t is "structure dev"
instead of "structure net_device" and of course "dev->ml_priv" will
cause compile error. But before my patch, in function wlan_setup(),
there is a ether_setup(net_device) which already broke kernels which
older than 2.3.38.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ad660e2f97e7dc9d0f5627456b37e64bde714a5e
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Sat Dec 6 23:57:49 2008 -0800
s390_net: Kill directly reference of netdev->priv
The private data comes from ccwgroup_device.
So just don't allocate private data memory when do alloc_netdev()
and use netdev->ml_priv to reference private data.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 26aca5ec9e587562ac0f8c5b67d02567d7bf2ffe
Author: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Date: Sat Dec 6 23:57:14 2008 -0800
net: Fix incorrect use of loose in spider_net.c
Fix incorrect use of loose in spider_net.c
It should be 'lose', not 'loose'.
Signed-off-by: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6c5cc8e0516005cb9a8f940276fac7614f7acf5c
Author: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Date: Sat Dec 6 23:55:32 2008 -0800
wireless: Fix incorrect use of loose in wext.c
Fix incorrect use of loose in wext.c
It should be 'lose', not 'loose'.
Signed-off-by: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a2acde07711f7d8b19928245c555bce60f91482a
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:49:37 2008 -0800
tcp: fix tso_should_defer in 64bit
Since jiffies is unsigned long, the types get expanded into
that and after long enough time the difference will therefore
always be > 1 (and that probably happens near boot as well as
iirc the first jiffies wrap is scheduler close after boot to
find out problems related to that early).
This was originally noted by Bill Fink in Dec'07 but nobody
never ended fixing it.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d5dd9175bc12015ea4d2c1a9b6b15dfa645a3db9
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:48:55 2008 -0800
tcp: use tcp_write_xmit also in tcp_push_one
tcp_minshall_update is not significant difference since it only
checks for not full-sized skb which is BUG'ed on the push_one
path anyway.
tcp_snd_test is tcp_nagle_test+tcp_cwnd_test+tcp_snd_wnd_test,
just the order changed slightly.
net/ipv4/tcp_output.c:
tcp_snd_test | -89
tcp_mss_split_point | -91
tcp_may_send_now | +53
tcp_cwnd_validate | -98
tso_fragment | -239
__tcp_push_pending_frames | -1340
tcp_push_one | -146
7 functions changed, 53 bytes added, 2003 bytes removed, diff: -1950
net/ipv4/tcp_output.c:
tcp_write_xmit | +1772
1 function changed, 1772 bytes added, diff: +1772
tcp_output.o.new:
8 functions changed, 1825 bytes added, 2003 bytes removed, diff: -178
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 730c30ec646bd252a9448a66ecd51d794853513f
Merge: 726e07a8a38168266ac95d87736f9501a2d9e7b2
0a0755c9fe47dc9f8271935909c66096e43efbfe
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 5 22:54:40 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
commit 726e07a8a38168266ac95d87736f9501a2d9e7b2
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:43:56 2008 -0800
tcp: move some parts from tcp_write_xmit
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 41834b7332a1ad3f7b6e8bbd83e6ce63586f0b07
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:43:26 2008 -0800
tcp: share code through function, not through copy-paste. :-)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ee6aac59505bcae5de1422c76956de62ac22170d
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:43:08 2008 -0800
tcp: drop tcp_bound_rto, merge content of it tcp_set_rto
Both are called by the same sites.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 50133161a83c9e5974d430cabd77d6430ca7d579
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:42:41 2008 -0800
tcp: no need to pass prev skb around, reduces arg pressure
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a1197f5a6faa23e5d0c1f8ed97b011deb2a75457
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:42:22 2008 -0800
tcp: introduce struct tcp_sacktag_state to reduce arg pressure
There are just too many args to some sacktag functions. This
idea was first proposed by David S. Miller around a year ago,
and the current situation is much worse that what it was back
then.
tcp_sacktag_one can be made a bit simpler by returning the
new sacked (it can be achieved with a single variable though
the previous code "caching" sacked into a local variable and
therefore it is not exactly equal but the results will be the
same).
codiff on x86_64
tcp_sacktag_one | -15
tcp_shifted_skb | -50
tcp_match_skb_to_sack | -1
tcp_sacktag_walk | -64
tcp_sacktag_write_queue | -59
tcp_urg | +1
tcp_event_data_recv | -1
7 functions changed, 1 bytes added, 190 bytes removed, diff: -189
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 775ffabf77a648d78fe1d20cb3a620e771abb921
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:41:26 2008 -0800
tcp: make mtu probe failure to not break gso'ed skbs unnecessarily
I noticed that since skb->len has nothing to do with actual segment
length with gso, we need to figure it out separately, reuse
a function from the recent shifting stuff (generalize it).
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9969ca5f205988fb96461075cb4914c55cf166b5
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:41:06 2008 -0800
tcp: Fix thinko making the not-shiftable to cover S|R as well
S|R won't result in S if just SACK is received. DSACK is
another story (but it is covered correctly already).
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f0bc52f38b09308fca85f3aa9300a341364fe9c6
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:40:47 2008 -0800
tcp: force mss equality with the next skb too.
Also make if-goto forest nicer looking.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 61c1d052a3c7d5acba3bd535aaffa5bb5d085181
Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Date: Fri Dec 5 22:39:49 2008 -0800
dccp: use roundup instead of opencoding
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d2b88814c6a63e4018cd299826907a12068ffdb7
Author: Alan Cox <alan@xxxxxxxxxx>
Date: Fri Dec 5 22:32:22 2008 -0800
tty: driverdata and discdata are void *
Remove all the extra casting while we are cleaning up
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8a1ec21e6c856b996cffcd4b33f037f6748a3ab4
Author: Alan Cox <alan@xxxxxxxxxx>
Date: Fri Dec 5 22:31:52 2008 -0800
tty: Flags should be accessed via the foo_bit interfaces
We have various drivers that poke around directly and we need to clean this
up before it causes problems.
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 098401a600b6344771900fe164c5eafb668ce99c
Merge: cb7b48f671f9c7582993a6c0ff6e989078048561
c112d0c5b89037dd618083b5fdf4bb36b0c51d77
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 5 22:23:34 2008 -0800
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit cb7b48f671f9c7582993a6c0ff6e989078048561
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Fri Dec 5 15:08:03 2008 -0800
igb/e1000e: Naming interrupt vectors
Change interrupt vector naming to match recent changes from Robert Olsson.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Acked-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1c721940ddd6496508f1f2fde5167b1c898b419b
Author: Stefan Roscher <ossrosch@xxxxxxxxxxxxxxxxxx>
Date: Fri Dec 5 11:25:38 2008 -0800
IB/ehca: Replace modulus operations in flush error completion path
With the latest flush error completion patch we introduced modulus
operation to calculate the next index within a qmap. Based on
comments from other mailing lists we decided to optimize this
operation by using an addition and an if-statement instead of modulus,
even though this is on the error path.
Signed-off-by: Stefan Roscher <stefan.roscher@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 3d0890985ac4dff781b7feba19fedda547314749
Author: Dave Olson <dave.olson@xxxxxxxxxx>
Date: Fri Dec 5 11:14:38 2008 -0800
IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
Fixes timing race resulting in panic. Not a performance sensitive path.
Signed-off-by: Dave Olson <dave.olson@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 1bf7724e093cf3071d943d53bfa4de8b8e50426b
Author: Dave Olson <dave.olson@xxxxxxxxxx>
Date: Fri Dec 5 11:13:19 2008 -0800
IB/ipath: Fix spi_pioindex value
ipath_piobufbase was a single value offset, but is multiple values on
newer chips, so use only the 32 bits for the 2K buffers (4K buffers
are currently used only by the driver).
Signed-off-by: Dave Olson <dave.olson@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 6114d4cd313acbb6e9935c2bee77e368d10c4f04
Author: Dave Olson <dave.olson@xxxxxxxxxx>
Date: Fri Dec 5 11:13:19 2008 -0800
IB/ipath: Only do 1X workaround on rev1 chips
Signed-off-by: Dave Olson <dave.olson@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 60e845035a066e81af1a29047530088d59150d8b
Author: Dave Olson <dave.olson@xxxxxxxxxx>
Date: Fri Dec 5 11:13:19 2008 -0800
IB/ipath: Don't count IB symbol and link errors unless link is UP
Implement the ignoring of ibsymbol errors and linkrecover errors while
the link is at less than INIT (long needed), to get accurate counts.
Particularly an issue when doing non-IBTA DDR negotiation with chips
from vendors that do not support IBTA mode negotiation. If the driver
is unloaded, and there is a delta, the adjusted counters are written
back to the chip, so they stay adjusted across driver reload.
Signed-off-by: Dave Olson <dave.olson@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 890fccb2427d53b48ab9d009fd87d55bcb173f62
Author: Ralph Campbell <ralph.campbell@xxxxxxxxxx>
Date: Fri Dec 5 11:13:18 2008 -0800
IB/ipath: Check return value of dma_map_single()
This fixes an obvious oversight where the return value is not checked
for error.
Signed-off-by: Ralph Campbell <ralph.campbell@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit fab01fc56063dafcc083f481ac0f9e6b5a576dd6
Author: Ralph Campbell <ralph.campbell@xxxxxxxxxx>
Date: Fri Dec 5 11:13:18 2008 -0800
IB/ipath: Fix PSN of send WQEs after an RDMA read resend
The PSN of the first packet after an RDMA read is based on the size of
the RDMA read request. This is calculated correctly for the WQE sent
after the first request message but not on subsequent requests if the
RDMA read is resent.
Signed-off-by: Ralph Campbell <ralph.campbell@xxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 6098d107499e1335f899bfcb558253fb7ee4f73f
Author: Chien Tung <chien.tin.tung@xxxxxxxxx>
Date: Fri Nov 21 20:51:01 2008 -0600
RDMA/nes: Cleanup warnings
Wrap NES_DEBUG and assert macros with do while (0) to avoid ambiguous
else. No one is using sk_buff * returned from form_cm_frame(), so
drop the return. drop_packet() should not be incrementing reset
counter on receiving a FIN.
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 1ee86555b2ad4d16a3c18253b7e4d70d34eb94f3
Author: Chien Tung <chien.tin.tung@xxxxxxxxx>
Date: Fri Nov 21 20:51:04 2008 -0600
RDMA/nes: Add loopback check to make_cm_node()
Check for loopback connection in make_cm_node().
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit f3181a10e13ac55e18958d7c48cba6f925c71483
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Fri Nov 21 20:50:55 2008 -0600
RDMA/nes: Check cqp_avail_reqs is empty after locking the list
Between the first empty list check and locking the list, the list can
change. Check it again after it is locked to make sure the list is
still not empty.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit abb77256761bc3ee7a21cc28f6f12a938964e83f
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Fri Nov 21 20:50:52 2008 -0600
RDMA/nes: Fix TCP compliance test failures
ANVL testing showed we are not handling all cm_node states during
connection establishment. Add missing state handlers and fix sequence
number send reset in handle_tcp_options().
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 4a14f6a79f5110c6033f0c61d77d07c449c2d083
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Fri Nov 21 20:50:49 2008 -0600
RDMA/nes: Forward packets for a new connection with stale APBVT entry
Under heavy traffic, there is a small windows when an APBVT entry is
not yet removed and a new connection is established. Packets for the
new connection are dropped until APBVT entry is removed. This patch
will forward the packets instead of dropping them.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 183ecfa3091cd4cdda329a7fe89d9544088f517d
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Fri Nov 21 20:50:46 2008 -0600
RDMA/nes: Avoid race between MPA request and reset event to rdma_cm
In passive open, after indicating MPA request to rdma_cm, an incoming
RST would fire a reset event to rdma_cm causing it to crash, since the
current state is not connected. The solution is to wait for
nes_accept() or nes_reject() before firing the reset event. If
nes_accept() or nes_reject() is already done, then the reset event
will be fired when RST is processed.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 879e5bd5a1a0a317fb67fa4dc550db092a7bdcb0
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Fri Nov 21 20:50:41 2008 -0600
RDMA/nes: Lock down connected_nodes list while processing it
While processing connected_nodes list, we would release the lock when
we need to send reset to remote partner. That created a window where
the list can be modified. Change this into a two step process: place
nodes that need processing on a local list then process the local list.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit c5d321e5c924384cf5b35f6288d69e9237490565
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Fri Nov 21 20:50:38 2008 -0600
RDMA/nes: Cleanup cqp_request list usage
Use nes_free_cqp_request() instead of open coding. Change some
continue to break in nes_cm_timer_tick, because send_entry used to be
a list processed in a loop (so continue went to the next item). Now
it is a single item, so using break is correct.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit abf681ce5b6f83f0b8883e0f2c12d197a38543dd
Author: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
Date: Mon Feb 18 14:34:46 2008 -0500
kbuild: remove TAR_IGNORE
Given that there is no usage of a TAR_IGNORE variable remove it
Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 28a1d869560a49d960ba2a3b450ec965712e5560
Author: Daniel Mack <daniel@xxxxxxxxx>
Date: Fri Dec 5 17:31:00 2008 +0100
ASoC: tlv320aic3x: control additions and cleanups
- split "Line Playback Switch" into "LineL Playback Switch" and "LineR
Playback Switch"
- split "Line PGA Bypass Playback Volume" into "LineL Left PGA Bypass
Playback Volume" and "LineR Right PGA Bypass Playback Volume"
- split "Line Line2 Bypass Playback Volume" into "LineL Line2 Bypass
Playback Volume" and "LineR Line2 Bypass Playback Volume"
- Added "HP Right PGA Bypass Playback Volume"
Signed-off-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 68fb740774a429ecbccd4d8b3287cf4883ad3ec2
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Thu Dec 4 22:39:54 2008 +0200
ASoC: Add support for OMAP3 Pandora
This patch adds basic support for OMAP3 Pandora.
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit c112d0c5b89037dd618083b5fdf4bb36b0c51d77
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Dec 3 03:35:30 2008 -0800
ath9k: Use GFP_ATOMIC when allocating TX private area
Using GFP_KERNEL was wrong and produces a 'scheduling while atomic'
bug as we're in a tasklet. Also, check for proper return values
now, in case allocation fails and be sure to stop the TX queue
in case of memory issues but gaurantee the TX queue will
eventually be woken up.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f8316df10c4e3bec5b4c3a5a8e026c577640c3a6
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Dec 3 03:35:29 2008 -0800
ath9k: Check for pci_map_single() errors
pci_map_single() can fail so detect those errors with
pci_dma_mapping_error() and deal with them accordingly.
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 73a5267087b5acd4a4288e0a1b809f09ca578d49
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Wed Dec 3 17:30:22 2008 +0100
rt2x00: Correctly initialize AID during set_key()
Request the AID from hardware and provide this id
to the driver (in case they need it).
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9c3444d33e65ade06af82d19522686c1873b953a
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Wed Dec 3 17:29:48 2008 +0100
rt2x00: Move crypto TX descriptor handling to rt2x00crypto.c
Move all code which determines the right TX descriptor
fields specific to crypto support into rt2x00crypto.c.
This makes the code in rt2x00queue more simpler and
better concentrates all crypto code into a single location.
With this we can also remove some ifdefs in rt2x00queue.c
since the code inside the ifdef is either very small, or
only calling empty functions (see empty function definitions
in rt2x00lib.h).
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1c02667db5eae801b8fc279fdfa618164c0efb6e
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Wed Dec 3 17:29:21 2008 +0100
rt2x00: Fix check for BSS info changes
Fix ERP configuration, due to a too strict changes
flags checking we never updated the short slot time
or basic rate mask when no other changes were made
at the same time.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4c7f0bc266ccccfb0ca397405af13ee3d9e0f6b2
Author: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Date: Wed Dec 3 00:19:04 2008 -0800
generic swap(): ath9k: rename swap() to swap_array()
In preparation for the introduction of a generic swap() macro.
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Cc: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Cc: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Cc: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Cc: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 74415edb042ef9f3b1291f978763687f35aadbb3
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Tue Dec 2 22:50:33 2008 +0100
rt2x00: Add RXDONE_CRYPTO_IV/ICV flags
Drivers should notify rt2x00lib when they provide
the IV/ICV data. This adds some flexibility to drivers
which can't provide all information.
* rt2500usb provides ICV inside the frame
* rt2800pci doesn't provide IV/ICV
* rt2800usb doesn't provide IV/ICV
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 011a03300bdd60782f465b97c3aefd58bfaae316
Author: Abhijeet Kolekar <abhijeet.kolekar@xxxxxxxxx>
Date: Tue Dec 2 12:14:07 2008 -0800
iwl3945 : Fix a-band association for passive channels
Patch does following things
1) This patch fixes the a-band association for passive channels with new
uCode feature that it allows direct scan on passive channels after
auto-switch from passive to active. This enables sending of direct
probes
on passive channels, as long as some traffic is detected on that
channel.
This improves the scanning for hidden SSIDs in A-band,which is all
passive channels.
This patch fixes the bug no 1748.
http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1748
2) This fix will only work with uCode version 15.28.2.8 and above.
Prior versions of uCode would work only if we heard the traffic within
active dwell time, which is much shorter than passive dwell time and
is shorter than typical beacon periods. This patch also provids full
active dwell time even if we hear traffic late in passive dwell.
3) uCode API version is incremented to 2.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Acked-by: Ben Cahill <ben.m.cahill@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a0987a8d68c86562f267efa97be01314c490c496
Author: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Date: Tue Dec 2 12:14:06 2008 -0800
iwlwifi: rely on API version read from firmware
This adds the infrastructure to support older firmware APIs.
The API version number is stored as part of the filename, we first try to
load the most recent firmware and progressively try lower versions.
The API version is also read from the firmware self and stored as part
of the iwl_priv structure. Only firmware that is supported by driver will
be loaded. The version number read from firmware is compared
to supported versions in the driver not the API version used as part of
filename.
An example using this new infrastrucure:
if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
Driver interacts with Firmware API version >= 2.
} else {
Driver interacts with Firmware API version 1.
}
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c02b3acd29766c6f79c2411cb5b85e1ee72c4c8f
Author: Chatre, Reinette <reinette.chatre@xxxxxxxxx>
Date: Tue Dec 2 12:14:05 2008 -0800
iwlwifi: store ucode version number
We store the ucode version number as part of
iwl_priv/iwl3945_priv. This enables us to determine
if particular ucode has support for features in order
to have driver support more than one ucode API.
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f3f911d1773d31f11038d90b04244bc3986c4ccd
Author: Zhu Yi <yi.zhu@xxxxxxxxx>
Date: Tue Dec 2 12:14:04 2008 -0800
iwlwifi: fix DMA channel number in iwl_txq_ctx_stop
The patch fixes the misuse of DMA channel number by Tx queue number in
iwl_tx_ctx_stop().
The problem was originally reported by Wu Fengguang who complains
iwlagn driver takes too long time when issuing `ifconfig wlan0 down`.
The patch now decreases the interface bring down time from 2 seconds
to 0.8 second.
This fixes bugs:
http://bugzilla.kernel.org/show_bug.cgi?id=11956
http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1790
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Tested-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 74221d07408c473721cce853ef4e0e66c0b326ba
Author: Abbas, Mohamed <mohamed.abbas@xxxxxxxxx>
Date: Tue Dec 2 12:14:03 2008 -0800
iwl3945: Fix iwl3945 rate scaling.
3945 rate scaling was broken in recent tree. This patch fix the following:
1- Get TX response info and update rates window.
2- Rate scaling selection.
3- Flush window timer.
Signed-off-by: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c30e30e17dad86d5e161cf9774eb4d549cc13191
Author: Abbas, Mohamed <mohamed.abbas@xxxxxxxxx>
Date: Tue Dec 2 12:14:02 2008 -0800
iwl3945: add debugfs support
Add debugfs support to 3945 driver to display rs info.
Signed-off-by: Mohamed Abbas <mohamed.abbas@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d366df5abb8d5ce7e2c36d3b678177787ccd9749
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 2 12:14:01 2008 -0800
iwlwifi: move channels sysfs to debugfs
This patch moves channels info display from sysfs to debugfs.
This shows channel information as stored in NIC EEPROM. This
is useful in debugging CRDA or iwl goes setting so it belongs
rather to debugfs then to sysfs.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0ad91a35bcb6dd993ad7d34f159afae929b4743d
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 2 12:14:00 2008 -0800
iwlwifi: move disable/enable interrupts to iwl-core.c
This patch moves iwl_enable_interrupts and iwl_disable_interrupts
functions to iwl-core.c
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c93007efaad0a90520ba73f025c663441bf7e9d6
Author: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Date: Tue Dec 2 12:13:59 2008 -0800
iwl3945: Select correct sta ID from find_station()
The find_station routine needs to look at the IWL_AP_ID entry if we're a
STA.
Currently, it only looks for STA entries which causes HW crypto to fail.
Signed-off-by: Samuel Ortiz <samuel.ortiz@xxxxxxxxx>
Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 99df630c3453e4a66b3408212dd8e55bc0e04f54
Author: Zhu Yi <yi.zhu@xxxxxxxxx>
Date: Tue Dec 2 12:13:58 2008 -0800
iwlwifi: fix printk size format error
The patch fixes a printk size format error.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8f5c87dcf6d1a5e6d7ffe642cfd4debb5ccbec49
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Tue Dec 2 12:13:57 2008 -0800
iwlwifi: move host command check function into separate file
This patch moves iwl_check_rxon_cmd into iwl-agn-hcmd-check.c
This function compiled out in none debugging or non development
mode and more. We haven't decided which one yet hence preserving the
current 'always compile' state.
More functions will be added to the file namely for checking TX and LQ
commands.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 304a698a5819bf318fe7e6ea9fe7ff2560365ec2
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Tue Dec 2 18:20:59 2008 +0100
rt2x00: Release rt2x00 2.2.3
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dddfb478b26e29a2b47f655ec219e743b8111015
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Tue Dec 2 18:20:42 2008 +0100
rt2x00: Implement HW encryption (rt2500usb)
rt2500usb supports hardware encryption.
rt2500usb supports up to 4 shared and pairwise keys.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0b927a079106e5f66c736e297370d3feb008e28e
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Tue Dec 2 18:20:22 2008 +0100
rt2x00: Remove duplicate code
Simplify rt2x00lib_config_antenna() by moving
duplicate code into a seperate static inlined
function.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 42c8285767dd17f450d986bdb163a8d56fb0330a
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Tue Dec 2 18:20:04 2008 +0100
rt2x00: Store retry limit values
Store retry limit values in the rt2x00dev structure.
This allows the removal of the FIXME where we assumed
the long retry is only used when working with RTS frames.
Instead we should check the current retry limit values
and decide if the required retry count for this frame
is a long or short retry.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1ce9cdac482f0dfbbd22ba4b3e5c016a05543a42
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Tue Dec 2 18:19:48 2008 +0100
rt2x00: Optimize IV/EIV handling
IV and EIV belong to eachother and don't require
2 seperate fields. Instead they can logically be
merged into a single array with size 2.
With this approach we can simplify the code in
rt2x00crypto.c by using a single memcpy() when
copying the iv/eiv data. Additionally we can
move some code out of if-statements because the
if-statement would always be true.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aac9207e45b1ec1f36d67e57d94f59ac036d37ee
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 2 18:37:54 2008 +0530
ath9k: Choose correct ANI calibration period
ANI can't be turned on/off dynamically yet, but the calculation
of the calibration period is wrong anyway. This patch fixes it.
Reported-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7470d7f54064557b6210671c2692bba19af5b79d
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Mon Dec 1 16:32:22 2008 -0800
iwlwifi: 5150 enable LO, TXIQ and BB calibrations
This patch enables LO, TXIQ, and BB calibrations for 5150
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fd63edba43c584d334e8fc161ca84e4cf54e26a0
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Mon Dec 1 16:32:21 2008 -0800
iwlwifi: 5150 parametrize eeprom versions
Add support for 5150 eeprom versions
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 339afc893d3c1a36151c7578d7eacd2f4b293d5f
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Mon Dec 1 16:32:20 2008 -0800
iwlwifi: 5150 compute ct kill threshold
This patch adds computation of ct kill threshold
for 5150. Threshold is computed from calibration
data in the EEPROM.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 819500c5892aeeed079d3ea1671df40f2dd1d417
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Mon Dec 1 16:32:19 2008 -0800
iwlwifi: 5150 enable DC calibration
This patch enables DC calibration for 5150
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7100e924661cc23609de8e7ab9fc3a13e0173891
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Mon Dec 1 16:32:18 2008 -0800
iwlwifi: 5150 add support for 5150
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d97809dbbf1b8a6df79c82be75fa0cababec783b
Author: Colin McCabe <colin@xxxxxxxxxxx>
Date: Mon Dec 1 13:38:55 2008 -0800
ath9k: Replace ath9k_opmode with nl80211_iftype
This patch kills ath9k's ath9k_opmode enum by replacing it with
nl80211_iftype.
Signed-off-by: Colin McCabe <colin@xxxxxxxxxxx>
Signed-off-by: Andrey Yurovsky <andrey@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 33fd8195529d74c0fe23cddd1c76fe7e03bbd324
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Mon Dec 1 18:50:27 2008 +0100
iwlwifi: disable AP mode
iwlwifi does not support AP mode in any way. For one, it doesn't even
buffer multicast/broadcast frames properly. We didn't allow zd1211rw AP
mode to be enabled without this, so iwlwifi shouldn't be allowed to
advertise AP mode either.
It also doesn't work at all, it doesn't even answer to probe requests,
I'm guessing the packet injection code was disabled again.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Acked-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c91276592695e13d1b52eab572551017cbf96ee7
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Mon Dec 1 18:19:36 2008 +0100
p54: fix lm87 checksum endianness
This fixes the checksum calculation for lm87 firmwares
on big endian platforms, the device treats the data as
an array of 32-bit little endian values so the driver
needs to do that as well.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Acked-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0f70f398460adb2d8aabb00e7e65f58247f219a3
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Mon Dec 1 18:13:05 2008 +0100
cfg80211: "fix" 11d oops
This "fixes" the 11d oops I was seeing. This needs some more work but I
cannot work on it now.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c58f9f635afe688c5c5709f441af57c12c7a4856
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 1 16:53:28 2008 +0100
iwl3945: remove obsolete irq handling
3945 hardware does not emit the interrupts CSR_INT_BIT_RF_KILL (rfkill
toggled) and CSR_INT_BIT_CT_KILL (adapter too hot). Hence this part of code
can be removed since iwl3945_irq_tasklet does not handle 4965 hw at all.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8e7be8da8ec7cc2828f4434d8d3c2ab4d1d4e7a4
Author: Rami Rosen <ramirose@xxxxxxxxx>
Date: Mon Dec 1 13:56:55 2008 +0200
mac80211: tx module cleanup.
This patch removes unnecessary parameter in ieee80211_beacon_add_tim() and
removes unneeded definition and assignment for bdev (instance of
net_device) in
ieee80211_beacon_get() and in ieee80211_get_buffered_bc()
(all in tx.c).
Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4a4f4d805db5c930ee4185162dcdc8db9a0379d5
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Mon Dec 1 12:07:56 2008 +0100
cfg80211: fix wiphy remove if no regulatory request
Fixes the segfault I just pointed out.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8bef7a10014c4579c66579ab47fc1bb9563ac42a
Author: Kalle Valo <kalle.valo@xxxxxxxxx>
Date: Sun Nov 30 20:56:28 2008 +0200
mac80211: document ieee80211_tx_info.pad
Fixes htmldocs warning:
Warning(mac80211.h:379): No description found for parameter 'pad[2]'
Signed-off-by: Kalle Valo <kalle.valo@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 02e37ba1298359baa123cf71ffa03d92abd259b2
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Nov 29 22:39:08 2008 +0100
p54: per-device names
This patch replaces the static "p54:" strings in front of most printk's
with their corresponding per-device names.
It was always a bit of a hassle to check which device was
generating all the messages.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b2023ddcfa6b79f26ef459867324f3d32b91aa07
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Nov 29 22:37:31 2008 +0100
p54: refactoring
Thanks to the introduction of "changed" flags, we no longer
have to do the bookkeeping of p54's firmware state for everything.
Thus we can cut down redundancy code.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 64c354ddcd65c98d9a1e2a8f7fb5cc80c7fa488e
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Nov 29 22:35:43 2008 +0100
p54: include support for 2.13.24.0 USB LM87 Firmwares
Those firmwares are probably capable of reprogramming the device's eeprom.
We better support them officially, before all the accidents happen.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 25900ef0191af98bbb24d8088c6887af31c1ba27
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Nov 29 22:34:37 2008 +0100
p54: utilize cryptographic accelerator
This patch allows p54 to utilize its WEP, TKIP and CCMP accelerator.
Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c772a08ba7192fa5450f85ef53adcbc6e0c5e1c9
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sat Nov 29 22:33:57 2008 +0100
p54: revamp station power save management in access point mode
This patch addresses the problem in:
http://marc.info/?l=linux-wireless&m=122727674810057&w=2
Thanks to Stefan Steuerwald <salsasepp@xxxxxxxxxxxxxx>
extensive iPod touch tests. We could finally squash some bugs in
p54's master mode / access point implementation.
Let's hope we got everything right this time and all stations
from now on will wake up on TIM and receive their queued frames
and go to sleep again without any hiccups.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4571d3bf87b76eae875283ff9f7243984b5ddcae
Author: Christian Lamparter <chunkeey@xxxxxx>
Date: Sun Nov 30 00:48:41 2008 +0100
mac80211: add sta_notify_ps callback
This patch is necessary in order to provide a proper Access point support
for p54.
Unfortunately for us, there is no documented way to disable the interfering
power save buffering mechanism in firmware completely.
Therefore we give in and notify the driver through our new sta_notify_ps
callback,
so that we can update the filter state.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2a163c6de452c0b321396caceac5d163949b4cf2
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Nov 28 22:21:08 2008 +0530
ath9k: Add a debugfs file for dumping DMA status
Debugfs file location: ath9k/<wiphy>/dma
Contains values in DMA debug registers.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 826d268091f0e0ecc50103f648b6183eb3efe04d
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Nov 28 22:20:23 2008 +0530
ath9k: Add initial layout for an ath9k specific debugfs mechanism
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 16d68abee5d700bfe09ae8324dbb76028995c589
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Nov 28 22:19:42 2008 +0530
ath9k: Remove includes that are not needed
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 88b126af946e7ea789f2a52d9d25aca681f93067
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Nov 28 22:19:02 2008 +0530
ath9k: Add ATH9K_DEBUG configuration option
Make debugging configurable, and add a module parameter
to give the debug mask.
Add debug.c to hold all debug specific code.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 04bd4638097c767278fdf12d50fecc8b60194d39
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Nov 28 22:18:05 2008 +0530
ath9k: Use cleaner debug masks
Remove all the useless __func__ prefixes in debug messages,
and replace the DPRINTF macro with a function.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d9a1f48648edbe99fa432626ce6964a1b58f7281
Author: herton <herton@xxxxxxxxxxxxxxx>
Date: Thu Nov 27 22:53:24 2008 -0200
rtl8187: fix retry count passed in rtl8187_tx
I mistakenly changed retry count passed in rtl8187_tx in previous change
"rtl8187: feedback transmitted packets using tx close descriptor for
8187B". For 8187 it should represent the number of retries (retry count
limit). As explained by Johannes Berg, .count represents the number of
tries (not retries), and retries = tries - 1.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Tested-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 007e5ddddfed4ba039899754936e89b27d5cb551
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Thu Nov 27 23:13:38 2008 +0100
wireless: clean up radiotap a bit
No need to pad the header so no constant needed for that,
no need to carry any version number from netbsd nor CVS
IDs from them.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e11602b7813502bf363c40cdb5a8c4b96d4bbc96
Author: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Date: Thu Nov 27 09:46:27 2008 +0530
ath9k: Handle channel initialization for AP mode
Hostapd now passes the HT parameters through the config()
callback, use these to set the appropriate channel in AP mode.
Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cb3da8ccc464409e3b947557cdac4cd0b1241c4c
Author: Fabio Rossi <rossi.f@xxxxxxxxx>
Date: Wed Nov 26 22:44:23 2008 +0100
mac80211: accept empty strings for hidden SSIDs
Some access points (e.g. Sitecom WL-174) use an empty string as hidden SSID.
Signed-off-by: Fabio Rossi <rossi.f@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e60c7744f8aa77bcbcb0b294596d6c87445d1200
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Wed Nov 26 23:31:40 2008 +0100
cfg80211: handle SIOCGIWMODE/SIOCSIWMODE
further reducing wext code in mac80211.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fee52678dbda2099a25243e79da98dc390e1939a
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Wed Nov 26 22:36:31 2008 +0100
cfg80211: handle SIOCGIWNAME
This patch moves the SIOCGIWNAME handling from mac80211 to cfg80211.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f650470a8f506bc33a15778432ebb8cdcf89175b
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Wed Nov 26 16:17:25 2008 -0500
ath5k: enable combined michael mic in key cache
For mac revisions >= "Griffin," the hardware allows the mic tx and rx
authenticator keys to share the same cache line, whereas earlier
hardware can only store the rx. Enable the combined mic on hardware
that supports it.
Changes to ath5k.h
Changes-licensed-under: 3-Clause-BSD
Changes to attach.c, pcu.c, reg.h
Changes-licensed-under: ISC
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 671434904633876f89be70af415c35c89fb90115
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Tue Nov 25 20:55:21 2008 -0500
ath5k: clean up ath5k_hw_set_key
Status: O
With the addition of TKIP (and soon CCMP), key->alg is a more useful
guide to key type than the key length.
This patch cleans up key type assignment in ath5k_hw_set_key by
extracting it into its own function. It also replaces the separate
memcpy() calls for extracting key material into the hardware format
with a loop that works regardless of key size.
Finally, the patch removes support for WEP-128 since it is a
non-standard key length that mac80211 also doesn't use.
Changes-licensed-under: ISC
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f6bac3ea5990653765700b2c3778b08782abebe5
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Wed Nov 26 16:17:11 2008 -0500
ath5k: preserve higher order bits when setting mac address
In some cases we would like to set the mac address without changing
the operating mode. However, Atheros cards store PCU data in the high
16 bits of the mac address register. Change ath5k_hw_set_lladdr() to
not clobber the PCU settings.
Changes-licensed-under: ISC
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 51e9bf5d795b8e01e54391f1790974c7b166d286
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Wed Nov 26 13:12:52 2008 -0800
iwlwifi: remove uses of __constant_{endian} helpers
The base versions handle constant folding just fine.
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 10ec4f1d0851eb97cd53db66150835dd7f64829d
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Nov 26 13:03:08 2008 -0800
nl80211: relicense nl80211.h under the ISC
We have a few BSD/ISC licensed userspace applications which
include nl80211.h from the kernel. To avoid legal ambiguity
for usage of the header file in these projects we rather simply
relicense the header file under the ISC. We've received consent
from all contributors to it.
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Acked-by: Michael Wu <flamingice@xxxxxxxxxxxx>
Acked-by: Luis Carlos Cobo <luisca@xxxxxxxxxxx>
Acked-by: Michael Buesch <mb@xxxxxxxxx>
Acked-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Acked-by: Colin McCabe <colin@xxxxxxxxxxx>
Acked-by: Javier Cardona <javier@xxxxxxxxxxx>
Cc: johannes@xxxxxxxxxxxxxxxx
Cc: altape@xxxxxxxxxxxxxxxx
Cc: luisca@xxxxxxxxxxx
Cc: mb@xxxxxxxxx
Cc: jouni.malinen@xxxxxxxxxxx
Cc: colin@xxxxxxxxxxx
Cc: javier@xxxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 72bdcf34380917260da41e3c49e10edee04bc5cd
Author: Jouni Malinen <j@xxxxx>
Date: Wed Nov 26 16:15:24 2008 +0200
nl80211: Add frequency configuration (including HT40)
This patch adds new NL80211_CMD_SET_WIPHY attributes
NL80211_ATTR_WIPHY_FREQ and NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET to allow
userspace to set the operating channel (e.g., hostapd for AP mode).
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 72eaa43a532b4156966444779829a986a4432f11
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Wed Nov 26 15:02:58 2008 +0100
mac80211: only transition STAs ps->wake on data frames
When a station goes to PS mode to scan, it will then send
probe requests without the PS bit set. mac80211 will take
that as indication that the station woke up, but it didn't.
This patch changes mac80211 to only consider doze->wake
transitions on data frames to to fix that issue.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Jouni Malinen <j@xxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0d950d84d9d16f7d4edf380a238c5b534ff00d11
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Tue Nov 25 13:36:01 2008 -0800
iwlwifi: properly initialize calibration command header
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8e268e47b8ca5bddd189320884c3cc7d9ae489f4
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Tue Nov 25 13:05:44 2008 +0200
mac80211: disassociate prior to unlinking AP/station
This patch reorders calls during disassociation in
ieee80211_set_disassoc function.
Since sta_info_unlink calls sta_notify(REMOVE) it will
remove the station representing AP from the driver before
it has disassociated from it using bss_info_changed callback.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e327b847e67051ece8d121f9aebeb4d736c36a02
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 1 14:56:41 2008 -0500
mac80211: deauth when interface is marked down
It seems like proper etiquette to let other stations know when we are
going down in either STA or IBSS mode. This also notifies userland, so
wpa_supplicant doesn't get confused.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 04adf890667050b83a58abaf63610e53a604261b
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Dec 3 13:55:38 2008 -0500
hostap: select required crypto bits in Kconfig
This is fallout from moving the crypto stuff to the new lib80211
component.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 21bbecdaaef3a6acc19905ab88c0587817318870
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Thu Dec 4 23:30:56 2008 -0500
ftrace: use init_struct_pid as swapper pid
Impact: clean up
Using (struct pid *)-1 as the pointer for ftrace_swapper_pid is
a little confusing for others. This patch uses the address of the
actual init pid structure instead. This change is only for
clarity. It does not affect the code itself. Hopefully soon the
swapper tasks will all have their own pid structure and then
we can clean up the code a bit more.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 21a8c466f99063eeb8567318b4e305eda9015408
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Dec 4 23:51:23 2008 +0100
tracing/ftrace: provide the macro task_curr_ret_stack()
Impact: cleanup
As suggested by Steven Rostedt, this patch provide a new macro
task_curr_ret_stack() to move the cpp conditionnal CONFIG into
the linux/ftrace.h headers.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 77d683f3e0258d522c5506e7b5fd05c9411184d9
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Dec 4 23:49:47 2008 +0100
tracing/ftrace: fix the check of ftrace_trace_task
Impact: fix default empty traces on function-graph-tracer
The actual ftrace_trace_task() checks if ftrace_pid_trace is allocated
and return 1 if it is true.
If it is NULL, it will check the bit of pid tracing flag for the current
task (which are not set by default).
So by default, a task is not traced.
Actually all tasks should be traced by default and filter_by_pid when
ftrace_pid_trace is allocated.
The appropriate condition should be to return 1 if filter_by_pid is
set.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acke-dby: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ff32504fdc56407654584ef187b20022c94a3486
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Dec 4 23:47:35 2008 +0100
tracing/ftrace: don't insert TRACE_PRINT during selftests
Impact: fix tracer selfstests false results
After setting a ftrace_printk somewhere in th kernel, I saw the
Function tracer selftest failing.
When a selftest occurs, the ring buffer is lurked to see if
some entries were inserted. But concurrent insertion such as
ftrace_printk could occured at the same time and could give
false positive or negative results.
This patch prevent prevent from TRACE_PRINT entries insertion
during selftests.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 970987beb9c99ca806edc464518d411cc399fb4d
Merge: faec2ec505d397e9426754722b6e80d519c4938f
1fd8f2a3f9a91b287a876cef830b21baafc8a799
feaf3848a813a106f163013af6fcf6c4bfec92d9
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 5 14:45:22 2008 +0100
Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and
'tracing/urgent' into tracing/core
commit a0286c94f07636380082608196d41dd725a83229
Author: Michael Tokarev <mjt@xxxxxxxxxx>
Date: Fri Dec 5 15:47:29 2008 +0300
x86: fix missing space in printk, #2
Impact: clean up printk
Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 12dde4c6d6e9092cf63094e84dc1fe4e505dd6d0
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 5 13:09:27 2008 +0100
ALSA: hda - Proper power-map toggling for input pins
The current code overrides the event type on input pins always to
PWR_EVENT. Although this still works (PWR_EVENT and INSERT_EVENT
are handled samely), it'd be better to avoid such overrides.
Also, currently the unsol events are registered even for fixed pins
which will never raise the pin-detection event.
This patch fixes both issues.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 55c395b47042e12d5c25aa07f271f56ffe44f793
Author: Michael Tokarev <mjt@xxxxxxxxxx>
Date: Fri Dec 5 14:42:20 2008 +0300
x86: fix missing space in printk
Just come across this when booting on an old hw..
Looks somewhat ugly, that single missing space ;)
Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e6e3ea25b1679b55728a8a470a50a8fff61e8a45
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 5 12:54:56 2008 +0100
ALSA: hda - Fix pin-detection in patch_sigmatel.c
The pin-detection function used in patch_sigmatel.c shouldn't be specific
to HP pin because it's used for input pins in general, too.
This patch fixes the detection function, removes the HP check from it
and moves to stac92xx_hp_detect().
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit e061b165c7f4ec5e2e160d990b49011b5b6e5c6a
Author: Martin Willi <martin@xxxxxxxxxxxxxx>
Date: Thu Dec 4 15:40:17 2008 -0800
xfrm: Accept ESP packets regardless of UDP encapsulation mode
From: Martin Willi <martin@xxxxxxxxxxxxxx>
An IPsec node speaking IKEv2 MUST accept incoming UDP encapsulated
ESP packets, even if no NAT situation is detected. This is important
if MOBIKE is in use. Some implementation keep the encapsulation
mode if they move out of a NAT situation.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3f9b766ca7c4654d41f4f21357031c1c1e7de29e
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Thu Dec 4 15:12:20 2008 -0800
sgi-xp: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
[ Kill unnecessary casts, noticed by Ilpo -DaveM ]
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 17c324fa80914e5b39d423dfd1a3cd61a3ec9866
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Thu Dec 4 15:07:33 2008 -0800
um: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6cbeba55c5cbd042040d6114471637e8b10d4a6b
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Thu Dec 4 15:06:56 2008 -0800
xtensa: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 28945dd4fba8dcbc1c74ea702b731caaedae6ccb
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Thu Dec 4 15:06:27 2008 -0800
simeth: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5da95273c2e63c9607652b5e8dd39808b6992d7c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Mon Nov 24 14:06:08 2008 +0100
ALSA: ca0106 - Add power-management support
Added the missing PM support for snd-ca0106 driver.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 84d727a109081684c2e01b811cb0d6dc3b9380ca
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Oct 9 16:58:19 2008 +0000
powerpc/4xx: Add support for ISA holes on 4xx PCI/X/E
This adds support for ISA memory holes on the PCI, PCI-X and
PCI-E busses of the 4xx platforms. The patch includes changes
to the Bamboo and Canyonlands device-trees to add such a hole,
others can be updated separately.
The ISA memory hole is an additional outbound window configured
in the bridge to generate PCI cycles in the low memory addresses,
thus allowing to access things such as the hard-decoded VGA
aperture at 0xa0000..0xbffff or other similar things. It's made
accessible to userspace via the new legacy_mem file in sysfs for
which support was added by a previous patch.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
commit 9d2421e8345602675132421fdaf4179af4705f5c
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Sun Nov 23 18:33:05 2008 +0000
powerpc/44x: update ppc44x_defconfig
This removes CONFIG_PCI_LEGACY (which is not needed) and consequently
several compiler warnings.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
commit 23f402c011b30f981a64c3752fca96cbac2cfd3d
Author: Hollis Blanchard <hollisb@xxxxxxxxxx>
Date: Mon Nov 10 14:58:28 2008 -0600
powerpc/kvm: update KVM config options in ppc44x_defconfig
KVM host support was recently enabled in ppc44x_defconfig, but since then
the
config option was renamed. Update ppc44x_defconfig to match.
Also, KVM guests aren't very interesting without networking, so enable
CONFIG_TUN and CONFIG_BRIDGE.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
Signed-off-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
commit 32c8dabc97d436582298ebd0e33af041c69f5a4b
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 19:41:13 2008 +0000
ASoC: Remove obsolete declaration of struct snd_soc_clock_info
The struct is never defined.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit affa219b60a11b3295637a97f5b1b8ef231490fc
Author: Joe Korty <joe.korty@xxxxxxxx>
Date: Wed Dec 3 18:58:19 2008 -0500
x86: change thread_info's flag field back to 32 bits
Impact: pack struct thread_info more tightly
Change x86_64's thread_info 'flags' field back to __u32.
This was changed to 'unsigned long' when the thread_info*.h
for i386 and x86_64 were merged. Change it back. We can
do this as only 27 bits of 'flags' are actually used.
This change actually packs down thread_info by 64 bits:
32 bits are saved by the smaller flags, and 32 bits are
saved by the following 'mm_segment_t field' becoming
naturally 64-bit aligned.
Signed-off-by: Joe Korty <joe.korty@xxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c0515566f3117c44b0572559bcc3cb00899b0910
Merge: 4385cecf1f5866fb33fc95e2ee26a44e9b6f6be2
061e41fdb5047b1fb161e89664057835935ca1d2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 4 11:05:26 2008 +0100
Merge commit 'v2.6.28-rc7' into x86/cleanups
commit 4e7c4d7b6d980264194c2aecbbb1e1e4c7302b63
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 4 10:25:37 2008 +0100
ALSA: hda - Add reference to HD-Audio.txt in ALSA-Configuration.txt
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 1fd8f2a3f9a91b287a876cef830b21baafc8a799
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Wed Dec 3 23:45:11 2008 +0100
tracing/function-graph-tracer: handle ftrace_printk entries
Handle the TRACE_PRINT entries from the function grapg tracer
and output them as a C comment just below the function that called
it, as if it was a comment inside this function.
Example with an ftrace_printk inside might_sleep() function:
void __might_sleep(char *file, int line)
{
static unsigned long prev_jiffy; /* ratelimiting */
ftrace_printk("Hi I'm a comment in might_sleep() :-)");
A chunk of a resulting trace:
0) | _reiserfs_free_block() {
0) | reiserfs_read_bitmap_block() {
0) | __bread() {
0) | __getblk() {
0) | __find_get_block() {
0) 0.698 us | mark_page_accessed();
0) 2.267 us | }
0) | __might_sleep() {
0) | /* Hi I'm a comment in might_sleep()
:-) */
0) 1.321 us | }
0) 5.872 us | }
0) 7.313 us | }
0) 8.718 us | }
And this patch brings two minor fixes:
- The newline after a switch-out task has disappeared
- The "|" sign just before the cpu number on task-switch has been deleted.
0) 0.616 us | pick_next_task_rt();
0) 1.457 us | _spin_trylock();
0) 0.653 us | _spin_unlock();
0) 0.728 us | _spin_trylock();
0) 0.631 us | _spin_unlock();
0) 0.729 us | native_load_sp0();
0) 0.593 us | native_load_tls();
------------------------------------------
0) cat-2834 => migrati-3
------------------------------------------
0) | finish_task_switch() {
0) 0.841 us | _spin_unlock_irq();
0) 0.616 us | post_schedule_rt();
0) 3.882 us | }
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit faec2ec505d397e9426754722b6e80d519c4938f
Author: Liming Wang <liming.wang@xxxxxxxxxxxxx>
Date: Thu Dec 4 14:24:49 2008 +0800
ftrace: avoid duplicated function when writing set_graph_function
Impact: fix a bug in function filter setting
when writing function to set_graph_function, we should check whether it
has existed in set_graph_function to avoid duplicating.
Signed-off-by: Liming Wang <liming.wang@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6b2539302bee8e88c99e3c7d80c16a04dbe5e2ad
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 4 09:18:28 2008 +0100
tracing: fix typo and missing inline function
Impact: fix build bugs
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e32d89569128e76bdf84867be0928902ca9f7555
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Thu Dec 4 00:26:41 2008 -0500
ftrace: add ability to only trace swapper tasks
Impact: new feature
This patch lets the swapper tasks of all CPUS be filtered by the
set_ftrace_pid file.
If '0' is echoed into this file, then all the idle tasks (aka swapper)
is flagged to be traced. This affects all CPU idle tasks.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 978f3a45d9499c7a447ca7615455cefb63d44165
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Thu Dec 4 00:26:40 2008 -0500
ftrace: use struct pid
Impact: clean up, extend PID filtering to PID namespaces
Eric Biederman suggested using the struct pid for filtering on
pids in the kernel. This patch is based off of a demonstration
of an implementation that Eric sent me in an email.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5ef6476190d24419a9a537baa0b5641845136989
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Thu Dec 4 00:26:39 2008 -0500
pid: fix the do_each_pid_task() macro
Impact: macro side-effects fix
This patch adds parenthesis around 'pid' in the do_each_pid_task
macro to allow callers to pass in more complex parameters.
e.g. do_each_pid_task(*pid, type, task)
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 804a685162a7080386714166776f57255a75238e
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 3 15:36:59 2008 -0500
ftrace: trace single pid for function graph tracer
Impact: New feature
This patch makes the changes to set_ftrace_pid apply to the function
graph tracer.
# echo $$ > /debugfs/tracing/set_ftrace_pid
# echo function_graph > /debugfs/tracing/current_tracer
Will cause only the current task to be traced. Note, the trace flags are
also inherited by child processes, so the children of the shell
will also be traced.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0ef8cde56ab92ab3f65221246dc1622c6b5068b3
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 3 15:36:58 2008 -0500
ftrace: use task struct trace flag to filter on pid
Impact: clean up
Use the new task struct trace flags to determine if a process should be
traced or not.
Note: this moves the searching of the pid to the slow path of setting
the pid field. This needs to be converted to the pid name space.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ea4e2bc4d9f7370e57a343ccb5e7c0ad3222ec3c
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 3 15:36:57 2008 -0500
ftrace: graph of a single function
This patch adds the file:
/debugfs/tracing/set_graph_function
which can be used along with the function graph tracer.
When this file is empty, the function graph tracer will act as
usual. When the file has a function in it, the function graph
tracer will only trace that function.
For example:
# echo blk_unplug > /debugfs/tracing/set_graph_function
# cat /debugfs/tracing/trace
[...]
------------------------------------------
| 2) make-19003 => kjournald-2219
------------------------------------------
2) | blk_unplug() {
2) | dm_unplug_all() {
2) | dm_get_table() {
2) 1.381 us | _read_lock();
2) 0.911 us | dm_table_get();
2) 1. 76 us | _read_unlock();
2) + 12.912 us | }
2) | dm_table_unplug_all() {
2) | blk_unplug() {
2) 0.778 us | generic_unplug_device();
2) 2.409 us | }
2) 5.992 us | }
2) 0.813 us | dm_table_put();
2) + 29. 90 us | }
2) + 34.532 us | }
You can add up to 32 functions into this file. Currently we limit it
to 32, but this may change with later improvements.
To add another function, use the append '>>':
# echo sys_read >> /debugfs/tracing/set_graph_function
# cat /debugfs/tracing/set_graph_function
blk_unplug
sys_read
Using the '>' will clear out the function and write anew:
# echo sys_write > /debug/tracing/set_graph_function
# cat /debug/tracing/set_graph_function
sys_write
Note, if you have function graph running while doing this, the small
time between clearing it and updating it will cause the graph to
record all functions. This should not be an issue because after
it sets the filter, only those functions will be recorded from then on.
If you need to only record a particular function then set this
file first before starting the function graph tracer. In the future
this side effect may be corrected.
The set_graph_function file is similar to the set_ftrace_filter but
it does not take wild cards nor does it allow for more than one
function to be set with a single write. There is no technical reason why
this is the case, I just do not have the time yet to implement that.
Note, dynamic ftrace must be enabled for this to appear because it
uses the dynamic ftrace records to match the name to the mcount
call sites.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit b29144c317fb748dae6d72c0f88eda9d43165b8d
Merge: b8307db2477f9c551e54e0c7b643ea349a3349cd
e8e1abe92fd7ea9d823a3aaf81d10e2cba593b6b
764f3b95131a7ce5c992e3d00caf590fcada2f7b
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 4 09:07:44 2008 +0100
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into
tracing/core
commit b8307db2477f9c551e54e0c7b643ea349a3349cd
Merge: f0461d0146ee30927bc7efa2ae24ea8c6693b725
061e41fdb5047b1fb161e89664057835935ca1d2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 4 09:07:19 2008 +0100
Merge commit 'v2.6.28-rc7' into tracing/core
commit 4151d154efc2eb1e48b0950e93660691426dd23f
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 4 07:49:15 2008 +0100
ALSA: hda - Add forgotten module alias for Nvidia MCP67 HDMI
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit e5f73435683122612742eb17252a6854b28f2511
Author: Scott Waye <scott@xxxxxxxxxx>
Date: Thu Dec 4 07:43:18 2008 +0100
ALSA: hda - Add MCP67 HDMI support
Added id for MCP67 HDMI codec.
Signed-off-by: Scott Waye <scott@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 36cbac5909d227c4de31fb93e1dd99c839c9cb6f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Dec 3 22:27:25 2008 -0800
net/ipv6/ip6mr.c: Use kmem_cache_zalloc, remove memset
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit df66f858074370a7ac7b21af2940e7a3a6af17c2
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 22:24:05 2008 -0800
if_usb: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 48502180e4b47fb2b1e7834fe0f16f4e553a053d
Author: Luotao Fu <lfu@xxxxxxxxxxxxxx>
Date: Wed Dec 3 22:23:18 2008 -0800
smc91x: remove isa stuff from smc91x driver
ISA support in smc91x is incomplete. I doubt there're any smc91x isa card.
This driver is greatly used on arm pxa platforms. Hence we remove the
isa stuff from smc91x driver.
Signed-off-by: Luotao Fu <lfu@xxxxxxxxxxxxxx>
Acked-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 999890b21a8eff7559a140fcbd2cd4b34e685c76
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 3 22:22:16 2008 -0800
net: /proc/net/ip_mr_cache, display Iif as a signed short
Today, iproute2 fails to show multicast forwarding unresolved cache
entries while scanning /proc/net/ip_mr_cache.
Indeed, it expects to see -1 in 'Iif' column to identify unresolved
entries but the kernel outputs 65535. It's a signed/unsigned issue:
'Iif', the source interface, is retrieved from member mfc_parent in
struct mfc_cache. mfc_parent is a vifi_t: unsigned short, but is
displayed in ipmr_mfc_seq_show() as "%-3d", signed integer.
In unresolevd entries, the 65535 value (0xFFFF) comes from this define:
#define ALL_VIFS ((vifi_t)(-1))
That may explains why the guy who added support for this in iproute2
thought a -1 should be expected.
I don't know if this must be fixed in kernel or in iproute2. Who is
right? What is the correct API? How was it designed originally?
I let you decide if it should goes in the kernel or be fixed in iproute2.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1ea472e2dedcf23d5f31c63fc790cccfab93c0de
Author: Benjamin Thery <benjamin.thery@xxxxxxxx>
Date: Wed Dec 3 22:21:47 2008 -0800
net: fix /proc/net/ip_mr_cache display - V2
/proc/net/ip_mr_cache and /proc/net/ip6_mr_cache displays garbage when
showing unresolved mfc_cache entries.
[root@qemu tests]# cat /proc/net/ip_mr_cache
Group Origin Iif Pkts Bytes Wrong Oifs
014C00EF 010014AC 1 10 10050 0 2:1 3:1
024C00EF 010014AC 65535 514 2 -559067475
The first line is correct. It is a resolved cache entry, 10 packets used
it...
The second line represents an unresolved entry, and the columns Pkts(4th),
Bytes(5th) and Wrong(6th) just show garbage.
In struct mfc_cache, there's an union to store data for resolved and
unresolved cases. And what ipmr_mfc_seq_show() is printing in these
columns for the unresolved entries is some bytes from mfc_cache.mfc_un.res.
Bad.
(eg. In our case -559067475 is in fact 0xdead4ead which is the spinlock
magic from mfc_cache.mfc_un.unres.unresolved.lock.magic).
This patch replaces the garbage data written in these columns for the
unresolved entries by '0' (zeros) which is more correct.
This change doesn't break the ABI.
Also, mfc->mfc_un.res.pkt, mfc->mfc_un.res.bytes, mfc->mfc_un.res.wrong_if
are unsigned long.
It applies on top of net-next-2.6.
The patch for net-2.6 is slightly different because of the NIP6_FMT to
%pI6 conversion that was made in the seq_printf.
Changelog:
==========
V2:
* Instead of breaking the ABI by suppressing the columns that have no
meaning for unresolved entries, fill them with 0 values.
Signed-off-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9de6d99a7559d20f7ababd1cacdc61ee5315f3c1
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Wed Dec 3 22:19:52 2008 -0800
netdev: remove pathetic compile-command lines
-m486, -O6 are partircularly amusing.
Remove some other useless lines near as well.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ec98ce480ada787f2cfbd696980ff3564415505b
Merge: 3496f92beb9aa99ef21fccc154a36c7698e9c538
feaf3848a813a106f163013af6fcf6c4bfec92d9
Author: James Morris <jmorris@xxxxxxxxx>
Date: Thu Dec 4 17:16:36 2008 +1100
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 8865c418caf4e9dd2c24bdfae3a5a4106e143e60
Author: David Woodhouse <David.Woodhouse@xxxxxxxxx>
Date: Wed Dec 3 22:12:38 2008 -0800
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dcd39c90290297f6e6ed8a04bb20da7ac2b043c5
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Wed Dec 3 22:10:38 2008 -0800
ne-h8300: convert to net_device_ops
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5618f0d1193d6b051da9b59b0e32ad24397f06a4
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Wed Dec 3 22:10:10 2008 -0800
hydra: convert to net_device_ops
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b6114794a1c394534659f4a17420e48cf23aa922
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Wed Dec 3 22:09:30 2008 -0800
zorro8390: convert to net_device_ops
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3e1d7cd2dc708f2054b2180e05ae283b9f91d543
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 22:07:10 2008 -0800
e1000: e1000_adapter->polling_netdev is useless
Commit bea3348eef27e6044b6161fd04c3152215f96411
"[NET]: Make NAPI polling independent of struct net_device objects."
made NAPI polling to be independent of net_device.
So e1000_adapter->polling_netdev is no longer used.
Kill it.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a4d2f34b7c3ff8a53df755961faf8186c6e7b464
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 22:05:58 2008 -0800
ixgbe: function comment typo
Seems the ixgbe's code was copied from e1000.
The comment talks about something not exist.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4e6c38cab208b369bfc8e9a57186581bf0b9987
Author: Guo-Fu Tseng <cooldavid@xxxxxxxxxxxxx>
Date: Wed Dec 3 21:20:04 2008 -0800
jme: Remove 64 and 40 bit dma_mask
Although the hardware supports the 64bit DMA address in design,
but later found that it actually not working.
This patch reduced the rang to 32bit.
Found-by: "Ethan" <ethanhsiao@xxxxxxxxxxx>
Signed-off-by: "Guo-Fu Tseng" <cooldavid@xxxxxxxxxxxxx>
Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4f40bf46897ddb57f149c0758f0cef0cc7782f7f
Author: akeemting <akeem@xxxxxxxxxxx>
Date: Wed Dec 3 21:19:16 2008 -0800
jme: GHC register control fix for new hardware
Due to the hardware design, except the first chip on the market,
other chips needs to setup the clock source for MAC processor
implicitly through Global Host Control Register(GHC).
(Strange design huh?)
10/100M uses the PCI-E as clock source, and 1G uses GPHY.
And I reordered the code a little, to make it easier to read.
Found-by: "Ethan" <ethanhsiao@xxxxxxxxxxx>
Fixed-by: "akeemting" <akeem@xxxxxxxxxxx>
Signed-off-by: "Guo-Fu Tseng" <cooldavid@xxxxxxxxxxxxx>
Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 59e4220a1112bf65924bc2e47b5757911b6f349b
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Wed Dec 3 21:17:27 2008 -0800
pkt_sched: sch_htb: Replace HTB_ACCNT() macro with inlines
Replace HTB_ACCNT() macro with inlines to make it more readable.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 23cb913d25b20ed88b36a26f337cfdb4605e63f4
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Wed Dec 3 21:16:58 2008 -0800
pkt_sched: sch_htb: Remove L2T()
L2T() is currently used only in one place (and has one spurious
parameter, btw), so let's: 'get rid of L2T completely, and just
use "qdisc_l2t(rate, size)" directly.' - quote & feedback from
David S. Miller.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 244ef9b9176c7c7a095f4738d353a3a60b88097d
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 21:14:04 2008 -0800
bond: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 97341249c4c30cf0eea5439ce2f36ee887e640fe
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 21:13:37 2008 -0800
mptlan: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0eade1f930fa3ba6461b34baf3ed8fa7c4abc40f
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 21:13:13 2008 -0800
dvb: Kill directly reference of netdev->priv
Simply replace netdev->priv with netdev_priv().
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c19f7a34f7cc7543c62ad065952e146dc77d1a38
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Wed Dec 3 21:09:45 2008 -0800
pkt_sched: sch_htb: Clean htb_class prio and quantum fields
While implementing htb_parent_to_leaf() there where added backup prio
and quantum struct htb_class fields to preserve these values for inner
classes in case of their return to leaf. This patch cleans this a bit
by removing union leaf duplicates.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 633fe66ed8385ccf8b4a74a00a4c6eb40850d65f
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Wed Dec 3 21:09:10 2008 -0800
pkt_sched: sch_htb: Remove htb_sched nwc_hit field
Remove practically unused struct htb_sched nwc_hit field.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4164d661b8c9602fbbf651a33377d2c51f68c451
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Wed Dec 3 21:08:44 2008 -0800
pkt_sched: sch_htb: Remove htb_class aprio field
Remove practically unused struct htb_class aprio field.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cb52deba12f27af90a46d2f8667a64888118a888
Author: Ed Swierk <eswierk@xxxxxxxxxxx>
Date: Mon Dec 1 12:24:43 2008 +0000
forcedeth: power down phy when interface is down
Bring the physical link down when the interface is down by placing the PHY
in power-down state, unless WOL is enabled. This mirrors the behavior of
other drivers including e1000 and tg3.
Without the patch, ifconfig down leaves the physical link up, which confuses
datacenter users who expect the link lights both on the NIC and the switch
to
go out when they bring an interface down.
Furthermore, even though the phy is powered on, autonegotiation stops
working,
so a normally gigabit link might suddenly become 100 Mbit half-duplex when
the
interface goes down, and become gigabit when it comes up again.
Ayaz said:
I would not include this patch until further testing is performed. NVIDIA
MCP chips use 3rd party PHY vendors. By powering down the phy, it could
have adverse affects on certain phys.
Arthur Jones said:
I just ran across this patch. Tested on a Marvell 88E1121R (GigE PHY)
and works great. This is a very important feature for me.
Signed-off-by: Ed Swierk <eswierk@xxxxxxxxxxx>
Tested-by: Arthur Jones <ajones@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a316084c2f18fd5371f81cfcfc8348a71c4a6fe8
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 1 12:24:46 2008 +0000
drivers/net/smc911x.c: smc911x_drv_probe() cleanup
Save an ugly ifdef.
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fd568fc3fe46fd87087717811d2f9ed27bb71558
Author: Julia Lawall <julia@xxxxxxx>
Date: Mon Dec 1 12:24:24 2008 +0000
drivers/isdn/mISDN: use ARRAY_SIZE
ARRAY_SIZE is more concise to use when the size of an array is divided by
the size of its type or the size of its first element.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@i@
@@
#include <linux/kernel.h>
@depends on i using "paren.iso"@
type T;
T[] E;
@@
- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 838361fe7828a3ad1aae8dee87620474931dac5e
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 15:49:46 2008 -0800
isdn: Kill directly reference of netdev->priv
Simply use netdev_priv() to replace netdev->priv.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 25dd7e6aedff054736f9edfd05bb585d810d8543
Author: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Date: Wed Dec 3 15:49:07 2008 -0800
hysdn: Kill directly reference of netdev->priv
Usually, netdev->priv should point to the memory of private
data which is allocated in alloc_netdev().
netdev_priv() is used to get the address of the private data.
Change the netdev->priv pointer to another memory is wrong.
Use netdev->ml_priv for this case.
Signed-off-by: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 52404881984e2d447f920a23e3bb63262dfc77f3
Author: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Date: Wed Dec 3 15:42:56 2008 -0800
Phonet: basic net namespace support
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d81d228567f55af517796638075dbbce9b40d7af
Author: Martin Willi <martin@xxxxxxxxxxxxxx>
Date: Wed Dec 3 15:38:07 2008 -0800
xfrm: Accept XFRM_STATE_AF_UNSPEC SAs on IPv4/IPv6 only hosts
Installing SAs using the XFRM_STATE_AF_UNSPEC fails on hosts with
support for one address family only. This patch accepts such SAs, even
if the processing of not supported packets will fail.
Signed-off-by: Martin Willi <martin@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66
Author: Peter Korsgaard <jacmet@xxxxxxxxxx>
Date: Tue Dec 2 21:58:06 2008 +0100
setlocalversion: add git-svn support
Print svn revision in addition to git info on git-svn repos.
Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 167d6a02c1dbdd84d49e87df7718f18fa31cb971
Author: Peter Korsgaard <jacmet@xxxxxxxxxx>
Date: Tue Dec 2 21:58:05 2008 +0100
setlocalversion: print correct subversion revision
Output svn revision of latest change, instead of repo revision as thats
what we're interested in (especially when working on a branch/tag).
Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 846442c8ddc02e378e7b981f0928449ed1ff1e1f
Author: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Date: Mon Dec 1 14:21:06 2008 -0800
scripts: improve the decodecode script
kerneloops.org has been using an improved "decodecode" script,
specifically it has a special marker that shows which line in the assembly
the oops happened at, like this:
20: 83 e0 03 and $0x3,%eax
23: 09 d8 or %ebx,%eax
25: 85 db test %ebx,%ebx
27: 89 02 mov %eax,(%edx)
29: 74 0f je 0x3a
2b:* 3b 73 04 cmp 0x4(%ebx),%esi <-- trapping
instruction
2e: 75 05 jne 0x35
30: 89 53 04 mov %edx,0x4(%ebx)
33: eb 07 jmp 0x3c
35: 89 53 08 mov %edx,0x8(%ebx)
this patch updates the kernel copy to also have this functionality.
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Reviewed-by: WANG Cong <wangcong@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit c39dd50240b97bfe4fcc49b41e1fe56675afcb94
Author: Jeremy Kerr <jk@xxxxxxxxxx>
Date: Mon Dec 1 14:21:03 2008 -0800
scripts/package: allow custom options to rpm
Add a RPMOPTS make variable to allow arbitrary options to be passed
to rpm during 'make rpm-pkg'. For example:
make RPMOPTS="--define '_topdir /home/jk/rpm'" rpm-pkg
Signed-off-by: Jeremy Kerr <jk@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 5dae9a550a7478c8d6a7da2336d3ceeebf90ab84
Author: Andreas Gruenbacher <agruen@xxxxxxx>
Date: Mon Dec 1 14:21:03 2008 -0800
genksyms: allow to ignore symbol checksum changes
This adds an "override" keyword for use in *.symvers / *.symref files.
When a symbol is overridden, the symbol's old definition will be used for
computing checksums instead of the new one, preserving the previous
checksum. (Genksyms will still warn about the change.)
This is meant to allow distributions to hide minor actual as well as fake
ABI changes. (For example, when extra type information becomes available
because additional headers are included, this may change checksums even
though none of the types used have actully changed.)
This approach also allows to get rid of "#ifdef __GENKSYMS__" hacks in the
code, which are currently used in some vendor kernels to work around
checksum changes.
Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 64e6c1e12372840e7caf8e25325a9e9c5fd370e6
Author: Andreas Gruenbacher <agruen@xxxxxxx>
Date: Mon Dec 1 14:21:01 2008 -0800
genksyms: track symbol checksum changes
Sometimes it is preferable to avoid changes of exported symbol checksums
(to avoid breaking externally provided modules). When a checksum change
occurs, it can be hard to figure out what caused this change: underlying
types may have changed, or additional type information may simply have
become available at the point where a symbol is exported.
Add a new --reference option to genksyms which allows it to report why
checksums change, based on the type information dumps it creates with the
--dump-types flag. Genksyms will read in such a dump from a previous run,
and report which symbols have changed (and why).
The behavior can be controlled for an entire build as follows: If
KBUILD_SYMTYPES is set, genksyms uses --dump-types to produce *.symtypes
dump files. If any *.symref files exist, those will be used as the
reference to check against. If KBUILD_PRESERVE is set, checksum changes
will fail the build.
Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit a680eedc6c621c75695c68198533fc3c98f4053b
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Wed Dec 3 22:24:13 2008 +0100
tags and cscope support really belongs in a shell script
as they do not benefit from the make functionality.
Moving the support to a shell script has several benefits:
- The readability of the code has increased a lot
- More people is able to extend the tags support
- We see less changes to the top-level Makefile
The shell script version includes improvements from:
Alexey Dobriyan <adobriyan@xxxxxxxxx> (jump to kconfig symbols)
Alexey Dobriyan <adobriyan@xxxxxxxxx> (drop ./ in paths)
Ian Campbell <ijc@xxxxxxxxxxxxxx> (simplified find algorithms)
This version has a few caveats:
=> It does not support ALLSOURCE_ARCHS
- it is easy to add if it is really used
=> It assumes all archs have moved to arch/$ARCH/include
- until that happens we have a few additional hits in the archs
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Tested-by: Ian Campbell <ijc@xxxxxxxxxxxxxx>
commit 361425fc32422c9716fc69e52455b7d44fc02c18
Author: Haiying Wang <Haiying.Wang@xxxxxxxxxxxxx>
Date: Wed Dec 3 14:03:09 2008 -0500
powerpc/85xx: Create dts for each core in CAMP mode for MPC8572DS
This patch creates the dts files for each core and splits the devices
between the two cores for MPC8572DS.
core0 has memory, L2, i2c, dma1, global-util, eth0, eth1, crypto, pci0,
pci1.
core1 has L2, dma2, eth2, eth3, pci2, msi.
MPIC is shared between two cores but each core will protect its interrupts
from other core by using "protected-sources" of mpic.
Signed-off-by: Haiying Wang <Haiying.Wang@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit f6682f915760ccfe57ef1b6cd5ff2d8f2bf8c1d4
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Wed Dec 3 22:11:14 2008 +0100
kconfig: fix options to check-lxdialog.sh
As noted by Bernhard - fix it up.
Cc: Bernhard Reutner-Fischer <rep.dot.nop@xxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 3b1ec9fb8197197d5e3bcca3a05e82d4f50f11bc
Author: Sally, Gene <Gene.Sally@xxxxxxxxxxx>
Date: Wed Oct 29 09:54:17 2008 -0400
kbuild: gen_init_cpio expands shell variables in file names
Modify gen_init_cpio so that lines that specify files can contain
what looks like a shell variable that's expanded during processing.
For example:
file /sbin/kinit ${RFS_BASE}/usr/src/klibc/kinit/kinit 0755 0 0
given RFS_BASE is "/some/directory" in the environment
would be expanded to
file /sbin/kinit /some/directory/usr/src/klibc/kinit/kinit 0755 0 0
If several environment variables appear in a line, they are all expanded
with processing happening from left to right.
Undefined variables expand to a null string.
Syntax errors stop processing, letting the existing error handling
show the user offending line.
This patch helps embedded folks who frequently create several
RFS directories and then switch between them as they're tuning
an initramfs.
Signed-off-by: gene.sally@xxxxxxxxxxx
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit efddd79512cc582675004bfdf7e66585198b38f9
Author: Werner Almesberger <werner@xxxxxxxxxxxx>
Date: Wed Nov 12 16:39:35 2008 -0200
remove bashisms from scripts/extract-ikconfig
unbashify-extract-ikconfig.patch
scripts/extract-ikconfig contains a lot of gratuituous bashisms,
which make it fail if /bin/sh isn't bash. This patch replaces them
with regular Bourne shell constructs.
Signed-off-by: Werner Almesberger <werner@xxxxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> # as file author
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit d2301249e2f9b9a3ba989703107192b538209e57
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Fri Nov 21 23:00:12 2008 +0100
kbuild: teach mkmakfile to be silent
With this fix a "make -s" is now really silent
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit fd54f502841c1caa7cfd5af564aad1bd017371fa
Author: Mike Frysinger <vapier@xxxxxxxxxx>
Date: Thu Nov 6 03:31:35 2008 -0500
kbuild: use KECHO convenience echo
Convert a few echos in the build system to new $(kecho) so we get correct
output according to build verbosity.
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
[sam: added kecho in a few more places for O=... builds]
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 5410ecc0def8955ab99810c5626cc7e156991896
Author: Mike Frysinger <vapier@xxxxxxxxxx>
Date: Thu Nov 6 03:31:34 2008 -0500
kbuild: introduce $(kecho) convenience echo
There is a bunch of places in the build system where we do 'echo' to show
some nice status lines. This means we still get output when running in
silent mode. So declare a new KECHO variable that only does 'echo' when we
are in a suitable verbose build mode.
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
[sam: added Documentation]
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit d03fab43c5ba4f5fa46db73c937e9b993a531d27
Author: Mike Frysinger <vapier@xxxxxxxxxx>
Date: Thu Nov 6 03:31:22 2008 -0500
kbuild: kill output in silent mode of mkcompile_h
The mkcompile_h script does `echo` regardless of silent mode the make is
running at, so have it respect $quiet from kbuild and only echo when not in
silent mode.
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit d8672b40d3a6f17de5b5bc71d6e531d7576a856a
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Fri Nov 21 21:50:02 2008 +0100
kbuild: expand -I in KBUILD_CPPFLAGS
kbuild failed to expand include flags in KBUILD_CPPFLAGS
resulting in code like this in arch Makefiles:
ifeq ($(KBUILD_SRC),)
KBUILD_CPPFLAGS += -Iinclude/foo
else
KBUILD_CPPFLAGS += -I$(srctree)/include/foo
endif
Move use of LINUXINCLUDE into Makefile.lib to allow
us to expand -I directives of KBUILD_CPPFLAGS so
we can avoid the above code.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit 5b91c33cf295d9c235f587f29a8c0a7ae15a5320
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Wed Dec 3 21:22:21 2008 +0100
kbuild: fix -I option expansion with O=... builds
When adding extra -I options with O=... we could
end up in a situation where there were no parameters to -I.
So we had a commandline that looked like this:
... -I -Wall ...
This had the undesired side effect that gcc assumed "-Wall"
was a path to look for include files so this options was
effectively ignored.
This happens only when we build the generated module.mod.c files
as part of the final modules builds and is as such harmless
with current kbuild.
This bug was exposed when we rearranged the options to gcc.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
commit dc7d7b830ee1f4111696e73d1c25da683b461548
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 18:21:52 2008 +0000
ASoC: Remove platform device from DAI suspend and resume operations
None of the DAIs use it except s3c2412-i2s which only uses it for
dev_() printouts.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 07c84d0409f3551b79d676630d8ee76bb551598d
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 18:17:28 2008 +0000
ASoC: Remove device from platform suspend and resume operations
None of the platforms are actually using the SoC device so remove it
(only atmel actually has a suspend method).
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 384c89e2e4cb5879b86a38414d1b3bb2b23ec8ee
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 17:34:03 2008 +0000
ASoC: Push debugfs files out of the snd_soc_device structure
This is in preparation for the removal of struct snd_soc_device.
The pop time configuration should really be a property of the card not
the codec but since DAPM currently uses the codec rather than the card
using the codec is fine for now.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit a7fe49bf01dd64b3c73ad0e172f68bd03c813d65
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 3 18:26:35 2008 +0100
ALSA: Add more documentation about HD-audio driver
The file can be converted to PDF via asciidoc.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 06be64a366885569f46a7e0e50b351266d28f5fc
Author: Haiying Wang <Haiying.Wang@xxxxxxxxxxxxx>
Date: Thu Nov 13 07:46:12 2008 -0600
powerpc/85xx: Don't reset the MPIC for CAMP mode on MPC8572DS
The flag MPIC_WANTS_RESET shouldn't be set if we are doing cooperative
asymmetric MP. The second linux shouldn't reset the pic or the first
one gets very confused.
Signed-off-by: Haiying Wang <Haiying.Wang@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit c64ef80b517680f1e228b2ee55e3ce7cd94c7fe0
Author: Haiying Wang <Haiying.Wang@xxxxxxxxxxxxx>
Date: Fri Nov 28 16:49:39 2008 -0500
powerpc/85xx: Add localbus node in mpc8572ds dts file
Also add NOR and NAND flash partitions for mpc8572ds board
Signed-off-by: Haiying Wang <Haiying.Wang@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 965dc5fc55fa0201fd8241ba7c0efc8f96f0ec84
Author: Martyn Welch <martyn.welch@xxxxxxxxxxx>
Date: Fri Nov 7 14:15:42 2008 +0000
powerpc/86xx: Basic GPIO support for GE Fanuc SBC610
Basic support for the GPIO available on the SBC610 VPX Single Board Computer
from GE Fanuc (PowerPC MPC8641D).
This patch adds basic support for the GPIO in the devices I/O FPGA, the GPIO
functionality is exposed through the AFIX pins on the backplane, unless used
by an AFIX card.
This code currently does not support switching between totem-pole and
open-drain outputs (when used as outputs, GPIOs default to totem-pole).
The interrupt capabilites of the GPIO lines is also not currently supported.
Signed-off-by: Martyn Welch <martyn.welch@xxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 09a3fba8c132a55f153fd65fc1085b717a6193c8
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Nov 11 18:31:39 2008 +0300
powerpc/qe: Move cmxgcr_lock definition from the ucc.c into the qe.c
With this patch we can compile the qe_lib/usb.c without the UCC
support (that is, without UCC_GETH and/or SERIAL_QE).
Fixes following link error (CONFIG_SMP should be =y to trigger this):
arch/powerpc/sysdev/built-in.o: In function `qe_usb_clock_set':
(.text+0x3cae): undefined reference to `cmxgcr_lock'
make: *** [.tmp_vmlinux1] Error 1
While at it, also add missing spinlock.h includes.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Acked-By: Timur Tabi <timur@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit d3a8cdab2ff2f8acbe48e18ed471b0812785e390
Author: Martyn Welch <martyn.welch@xxxxxxxxxxx>
Date: Thu Nov 20 08:52:09 2008 +0000
powerpc/86xx: Add use of Epson RTX-8581 RTC to GE Fanuc SBC610 dts
Adding use of newly added Epson RTX-8581 real-time clock driver to GE
Fanuc SBC610's dts file and adding driver to default config.
Signed-off-by: Martyn Welch <martyn.welch@xxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 24a99596f7465274a8e65ddd29a7d9028969b9f9
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 09:31:35 2008 -0600
powerpc/85xx: Fix compile warnings in mpc85xx_mds.c
arch/powerpc/platforms/85xx/mpc85xx_mds.c: In function 'board_fixups':
arch/powerpc/platforms/85xx/mpc85xx_mds.c:244: warning: format '%x' expects
type 'unsigned int', but argument 4 has type 'resource_size_t'
arch/powerpc/platforms/85xx/mpc85xx_mds.c:250: warning: format '%x' expects
type 'unsigned int', but argument 4 has type 'resource_size_t'
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit e8e1abe92fd7ea9d823a3aaf81d10e2cba593b6b
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 3 11:04:51 2008 -0500
ftrace: fix race in function graph during fork
Impact: graph tracer race/crash fix
There is a nasy race in startup of a new process running the
function graph tracer. In fork.c:
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
ftrace_graph_init_task(p);
proc_fork_connector(p);
cgroup_post_fork(p);
return p;
The new task is free to run as soon as the tasklist_lock is released.
This is before the ftrace_graph_init_task. If the task does run
it will be using the same ret_stack and curr_ret_stack as the parent.
This will cause crashes that are difficult to debug.
This patch moves the ftrace_graph_init_task to just after the alloc_pid
code. This fixes the above race.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0a37119d963e876ca86912497346ec50dea2541b
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 3 11:04:50 2008 -0500
trace: fix output of stack trace
Impact: fix to output of stack trace
If a function is not found in the stack of the stack tracer, the
number printed is quite strange. This fixes the algorithm to handle
missing functions better.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0f620830db0818ebe065b31c33892e8f0622e1b2
Author: Peter Gruber <nokos@xxxxxxx>
Date: Wed Dec 3 15:32:15 2008 +0100
ALSA: Reduce stall detection timeout in riptide.c
Reduce the command timeout to 0.5sec. Should be enough to allow a
working command interface but removes a RCU stall and slow resume on
some revisions where the AC97 revision detection stalls in resume.
Signed-off-by: Peter Gruber <nokos@xxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit d5b26db2cfcf09f28f4839c8c3484279cd5ea5b3
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 19 09:35:56 2008 -0600
powerpc/85xx: Add support for SMP initialization
Added 85xx specifc smp_ops structure. We use ePAPR style boot release
and the MPIC for IPIs at this point.
Additionally added routines for secondary cpu entry and initializtion.
Signed-off-by: Andy Fleming <afleming@xxxxxxxxxxxxx>
Signed-off-by: Trent Piepho <tpiepho@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 06b90969a7564fad888f67e9f7f4c3a51a16ef1d
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 1 14:38:32 2008 -0600
powerpc/85xx: minor head_fsl_booke.S cleanup
Removed unused branch labels
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit b3898895355f73973eb3aef3489e999d3fb8e2bc
Author: Trent Piepho <tpiepho@xxxxxxxxxxxxx>
Date: Wed Nov 19 03:13:14 2008 -0800
powerpc: Better setup of boot page TLB entry
The initial TLB mapping for the kernel boot didn't set the memory coherent
attribute, MAS2[M], in SMP mode.
If this code supported booting a secondary processor, which it doesn't yet,
but if it did, then when a secondary processor boots, it would probably
signal
the primary processor by setting a variable called something like
__secondary_hold_acknowledge. However, due to the lack of the M bit, the
primary processor would not snoop the transaction (even if a transaction
were
broadcast). If primary CPU's L1 D-cache had a copy, it would not be flushed
and the CPU would never see the ack. Which would have resulted in the
primary
CPU spinning for a long time, perhaps a full second before it gives up,
while
it would have waited for the ack from the secondary CPU that it wouldn't
have
been able to see because of the stale cache.
The value of MAS2 for the boot page TLB1 entry is a compile time constant,
so there is no need to calculate it in powerpc assembly language.
Also, from the MPC8572 manual section 6.12.5.3, "Bits that represent
offsets within a page are ignored and should be cleared." Existing code
didn't clear them, this code does.
The same when the page of KERNELBASE is found; we don't need to use asm to
mask the lower 12 bits off.
In the code that computes the address to rfi from, don't hard code the
offset to 24 bytes, but have the assembler figure that out for us.
Signed-off-by: Trent Piepho <tpiepho@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 6a800f36acd5bf06b5fe2cb27c4d0524d60c3df5
Author: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Date: Tue Oct 28 11:50:21 2008 +0800
powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.
This patch add the handlers of SPE/EFP exceptions.
The code is used to emulate float point arithmetic,
when MSR(SPE) is enabled and receive EFP data interrupt or EFP round
interrupt.
This patch has no conflict with or dependence on FP math-emu.
The code has been tested by TestFloat.
Now the code doesn't support SPE/EFP instructions emulation
(it won't be called when receive program interrupt),
but it could be easily added.
Signed-off-by: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 033b8a333c66e0a7dc63132c1bd65175dc98bc25
Author: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Date: Tue Oct 28 11:50:20 2008 +0800
powerpc/math-emu: Remove redundant 'ret'
FP_DECL_EX is already used, so ret is redundant.
And FP_SET_EXCEPTION will add status into return value.
Signed-off-by: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 463a8c01e153c06480b862d83d6a71bf5666a577
Author: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Date: Tue Oct 28 11:50:19 2008 +0800
powerpc/math-emu: Adopt new version of _FP_CHOOSENAN
Move to using the same macro definition for _FP_CHOOSENAN as s390,
sh, sparc32/64. The original author didn't understand this and
matched what sparc64 was doing and they have updated to this definition.
Signed-off-by: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit cf03033658739accd24f18f864107151a2e9a796
Author: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Date: Tue Oct 28 11:50:18 2008 +0800
powerpc/math-emu: Fix single float point division bug
PowerPC float point division emulation is derived from gcc.
I reported this problem on gcc maillist and got this reply:
http://gcc.gnu.org/ml/gcc/2008-03/msg00543.html
Since UDIV_NEEDS_NORMALIZATION is not used by kernel, we should use
_FP_DIV_MEAT_1_udiv_norm to make sure the single float point
is normalized before udiv_qrnnd.
Signed-off-by: Liu Yu <yu.liu@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 55b9121b4295a8260e52dd78327f1edd1e34feb2
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Tue Oct 28 08:55:05 2008 -0500
powerpc: Remove unncessary SPE related compiler flag
After testing of various compiler flag combinations by Nate Case it was
determined that -mabi=no-spe has no impact on the compiler generating
SPE instructions. Only -mno-spe and -mspe=no do.
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
commit 0640f84fac8a8aa8e7911c950cd9a4b0199711f6
Merge: 8c2f767bf3c4a7932898e657c6b12a2234cd2eca
ff7a3267368634e368ebaac68d5e3abf129edd1d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 3 14:43:14 2008 +0100
Merge branch 'topic/hda-modularize' into topic/hda
commit 6f2a974bfc8d3be7a30674c71e2fef003b39a8d2
Author: Daniel Mack <daniel@xxxxxxxxx>
Date: Wed Dec 3 11:44:17 2008 +0100
ASoC: tlv320aic3x: headset/button press support
- Add aic3x_set_headset_detection() function to define the headset
detection mode for tlv32aic3x chips
- added aic3x_button_pressed()
- Read from the real-time registers in aic3x_headset_detected() to query
headset presence without an occured interrupt
Signed-off-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 4b4fffdd9d179677cb030e97869286b62df25adc
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 3 11:21:08 2008 +0000
ASoC: Fix WM8903 right mixer bypass path
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 5920b45303291057fef827f5bdafe04001c1bbae
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Tue Dec 2 20:48:58 2008 +0200
ASoC: TWL4030: Add input selection and gain controls
The TWL4030 codec device has two ADCs. Both of them can have
several inputs routed to them, but TRM says that only one source
can be selected for every ADC, even though every source has a
dedicated bit in the registers.
This patch adds input source controls. It modifies default register
values to have no inputs selected and ADCs disabled. When some
input is selected, control handlers enable apropriate input
amplifier and ADC. If a microphone is selected, bias power is
automatically enabled. When some input is deselected, unused
chip parts are disabled.
Microphone and line input recording tested on OMAP3 pandora board.
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 7947cf0dd4b6a2bb06c57971502fb81c76a66f2d
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 01:28:28 2008 +0000
hvc_console: Always schedule resize work on resize
The test to check for a new winsize runs out-of-sync with the
underlying tty. After a tty has been released and initialized again,
the winsize might differ between the tty and the hp struct. The
solution is to simply remove the check and always schedule the resize
work.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 3d26825ec03f623f20ba860e6e6113ab2d0bb0f1
Author: roel kluin <roel.kluin@xxxxxxxxx>
Date: Tue Dec 2 11:21:43 2008 +0000
powerpc: Make open count variables signed in hvcs/hvsi/hvc_console
Otherwise the tests for count < 0 will never be true.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit dc42149fccda63a5d2fa4457808c3489a5111c5e
Author: Nicolas Palix <npalix@xxxxxxx>
Date: Tue Dec 2 03:38:55 2008 +0000
drivers/hvc: Add missing of_node_put
of_node_put is needed before discarding a value received from
of_find_node_by_name, e.g., in error handling code or when the device
node is no longer used.
The semantic match that catches the bug is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression struct device_node *n;
position p1, p2;
statement S1,S2;
expression E,E1;
expression *ptr != NULL;
@@
(
if (!(n@p1 = of_find_node_by_name(...))) S1
|
n@p1 = of_find_node_by_name(...)
)
<... when != of_node_put(n)
when != if (...) { <+... of_node_put(n) ...+> }
when != true !n || ...
when != n = E
when != E = n
if (!n || ...) S2
...>
(
return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
n = E1
|
E1 = n
)
@script:python@
p1 << r.p1;
p2 << r.p2;
@@
print "* file: %s of_find_node_by_name %s return %s" %
(p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Nicolas Palix <npalix@xxxxxxx>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Acked-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit b908b53d580c3e9aba81ebe3339c5b7b4fa8031d
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Mon Dec 1 06:30:04 2008 +0000
of/gpio: Implement of_get_gpio_flags()
This adds a new function, of_get_gpio_flags, which is like
of_get_gpio(), but accepts a new "flags" argument. This new function
will be used by the drivers that need to retrieve additional GPIO
information, such as active-low flag.
Also, this changes the default ("simple") .xlate routine to warn about
bogus (< 2) #gpio-cells usage: the second cell should always be present
for GPIO flags.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2fd091f3eebc5accefa5f77ff04436982765d15c
Author: roel kluin <roel.kluin@xxxxxxxxx>
Date: Sat Nov 29 01:17:27 2008 +0000
powerpc/macintosh: Fix unsigned check in smu_sat_get_sdb_partition()
i2c_smbus_read_word_data() returns a s32, which may be negative
but unsigned len cannot be negative.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit e6a437eba09f1c3505bedf7a9a9766a878ca09fa
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Fri Nov 28 09:13:45 2008 +0000
of/i2c: Fill the archdata for I2C devices
For I2C devices we just setting the node pointer in the archdata. This
is needed so that the I2C devices could find their OF tree nodes.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 3f3b1632022fcc8317fa3b3c1236471415b3a6b8
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Fri Nov 28 09:13:23 2008 +0000
powerpc and sparc: Introduce dev_archdata node accessors
The name of the device_node field differ across the platforms, so we
have to implement inlined accessors. This is needed to avoid ugly
#ifdef in the generic code.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit a0e2f9f4a2487572803d5a00c7302db30e4c60d3
Author: Sonny Rao <sonnyrao@xxxxxxxxxx>
Date: Sun Nov 9 14:15:11 2008 +0000
powerpc/BSR: Support multiple OF-node description of BSR
This adds support for multiple BSR nodes in the OF device tree.
Previously, the BSR driver only supported a single OF node describing
a BSR. Apparently when an LPAR is set to use "all system resources"
the BSR appears as a single node, but when it is handed out in pieces,
each 8 byte piece gets its own node. So, this keeps a list of BSR
devices instead of the array and includes all nodes.
Also, this makes the code be more inclusive of what BSR devices we
accept by only checking compatibility and not the device name property
(which might change in the future versions of BSR).
Signed-off-by: Sonny Rao <sonnyrao@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6358d6cb328a772eb6f02c870da61709d539480f
Author: Sebastien Dugue <sebastien.dugue@xxxxxxxx>
Date: Thu Nov 27 01:19:18 2008 +0000
powerpc/ibmebus: Get rid of the IRQ mapping in ibmebus_free_irq()
ibmebus_free_irq() frees the IRQ but does not remove its mapping, which
results in stale entries in the map.
This fixes it by adding a call to irq_dispose_mapping() in
ibmebus_free_irq().
Signed-off-by: Sebastien Dugue <sebastien.dugue@xxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 786b32f892dc341b607445bdef29d8e41a840925
Author: Julia Lawall <julia@xxxxxxx>
Date: Sun Nov 23 00:48:56 2008 +0000
powerpc: Eliminate NULL test and memset after alloc_bootmem
As noted by Akinobu Mita in commit b1fceac2 ("x86: remove unnecessary
memset and NULL check after alloc_bootmem()"), alloc_bootmem and
related functions never return NULL and always return a zeroed region
of memory. Thus a NULL test or memset after calls to these functions
is unnecessary.
This was fixed using the following semantic patch.
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression E;
statement S;
@@
E =
\(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...)
... when != E
(
- BUG_ON (E == NULL);
|
- if (E == NULL) S
)
@@
expression E,E1;
@@
E =
\(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...)
... when != E
- memset(E,0,E1);
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 15e09c0ecaab4a1b4a7ed69db536c38948b92279
Author: Becky Bruce <becky.bruce@xxxxxxxxxxxxx>
Date: Thu Nov 20 06:49:16 2008 +0000
powerpc: Add sync_*_for_* to dma_ops
We need to swap these out once we start using swiotlb, so add
them to dma_ops. Create CONFIG_PPC_NEED_DMA_SYNC_OPS Kconfig
option; this is currently enabled automatically if we're
CONFIG_NOT_COHERENT_CACHE. In the future, this will also
be enabled for builds that need swiotlb. If PPC_NEED_DMA_SYNC_OPS
is not defined, the dma_sync_*_for_* ops compile to nothing.
Otherwise, they access the dma_ops pointers for the sync ops.
This patch also changes dma_sync_single_range_* to actually
sync the range - previously it was using a generous
dma_sync_single. dma_sync_single_* is now implemented
as a dma_sync_single_range with an offset of 0.
Signed-off-by: Becky Bruce <becky.bruce@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit c4d04be11f99cc9ce4e3801a5da235727db704a9
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Thu Nov 20 03:24:07 2008 +0000
powerpc: Allow the max stack trace depth to be configured
On my screen, when something crashes, I only have space for maybe 16
functions of the stack trace before the information above it scrolls
off the screen. It's easy to hack the kernel to print out only that
much, but it's harder to remember to do it. This introduces a config
option for it so that I can keep the setting in my config.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 0186f47e703fb7aa14b54459d642ef5374b3a685
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 19 12:50:04 2008 +0000
powerpc: Use RCU based pte freeing mechanism for all powerpc
Refactor the RCU based pte free code that was used on ppc64 to be used
on all powerpc.
Additionally refactor pte_free() & pte_free_kernel() into common code
between ppc32 & ppc64.
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit df3b8611554e389e703fa753540289874fa5126c
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 19 05:53:24 2008 +0000
powerpc: Add a local_flush_tlb_page to handle kmap_atomic invalidates
The tlb invalidates in kmap_atomic/kunmap_atomic can be called from
IRQ context, however they are only local invalidates (on the processor
that the kmap was called on). In the future we want to use IPIs to
do tlb invalidates this causes issue since flush_tlb_page() is considered
a broadcast invalidate.
Add local_flush_tlb_page() as a non-broadcast invalidate and use it in
kmap_atomic() since we don't have enough information in the
flush_tlb_page() call to determine its local.
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit f4f3a1261ad70988ad45614ebc87e553143a332b
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 19 05:53:04 2008 +0000
powerpc: hash_page_sync should only be used on SMP & STD_MMU_32
Clean up the ifdefs so we only use hash_page_sync if we have
CONFIG_SMP && CONFIG_PPC_STD_MMU_32.
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 4ee5f55175a85fc179c93f00dd7f6a99c896f4d6
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 27 20:05:05 2008 +0000
powerpc: Fix ppc32 mm_struct CPU tracking in SMP
The 32-bit hash code didn't need it so far so we don't update
mm->cpu_vm_mask on context switch. This however will break when we
merge the RCU based page table freeing patch and other upcoming 32-bit
embedded SMP work, so this adds the update.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 1b98326b91eb9eea346945779e1f245aa66b17ce
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 19 04:39:53 2008 +0000
powerpc: Add MSR[CE, DE] to the MSR bits we print on show_regs()
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 764f3b95131a7ce5c992e3d00caf590fcada2f7b
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 3 10:33:58 2008 +0100
tracing/function-graph-tracer: enabled by default
CONFIG_FUNCTION_GRAPH_TRACER depends on FUNCTION_TRACER already,
(turning it non-default) so it so making it default-n is pointless.
So enable it by default - it's a nice extension of the function tracer.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 527491885554002837b5742202adc0ab5f536e54
Merge: cea555d384b85271035814c5adad23e6c7fc5d2a
2434bbb30e79468c49cff3cff6005236f55ed188
Author: Paul Mackerras <paulus@xxxxxxxxx>
Date: Wed Dec 3 20:11:06 2008 +1100
Merge branch 'merge'
commit 29fa0b301bc823016d1a3bed41c36a8977ef9947
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Wed Dec 3 00:33:09 2008 -0800
xfrm: Cleanup for unlink SPD entry
Used __xfrm_policy_unlink() to instead of the dup codes when unlink
SPD entry.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 22d55328b7d27694718f5d64a53d2bddbbe173a5
Merge: 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123
d5654efd3ff1cd0baa935a0c9a5d89862f07d009
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 3 00:29:24 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 166d3c7994d79ab3f78f420607283361ff5cce79
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Wed Dec 3 02:32:12 2008 +0100
tracing/function-graph-tracer: improve duration output
Impact: better trace output of duration for long calls
The old duration output didn't exceeded 9999.999 us to fit the column
and the nanosecs were always 3 numbers. As Ingo suggested, it's better
to have the whole microseconds elapsed time and shift the nanosecs precision
if needed to fit the maximum 7 numbers. And usec need more number, the case
should be rare and important enough to break a bit the column alignment to
show it.
So, depending of the duration value, we now have these patterns:
u.nnn us
uu.nnn us
uuu.nnn us
uuuu.nnn us
uuuuu.nn us
uuuuuu.n us
uuuuuuuu..... us
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 11e84acc400921743cc8d488e4a265cd98a655c7
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Wed Dec 3 02:30:37 2008 +0100
tracing/function-graph-tracer: display unified style cmdline and pid
Impact: extend function-graph output: let one know which thread called a
function
This patch implements a helper function to print the couple cmdline/pid.
Its output is provided during task switching and on each row if the new
"funcgraph-proc" defualt-off option is set through trace_options file.
The output is center aligned and never exceeds 14 characters. The cmdline
is truncated over 7 chars.
But note that if the pid exceeds 6 characters, the column will overflow (but
the situation is abnormal).
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 62679efe0a5f02987a621942afc5979a80a6ca5a
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 23:50:06 2008 -0500
ftrace: add checks on ret stack in function graph
Import: robustness checks
Add more checks in the function graph code to detect errors and
perhaps print out better information if a bug happens.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e49dc19c6a19ea112fcb94b7c62ec62cdd5c08aa
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 23:50:05 2008 -0500
ftrace: function graph return for function entry
Impact: feature, let entry function decide to trace or not
This patch lets the graph tracer entry function decide if the tracing
should be done at the end as well. This requires all function graph
entry functions return 1 if it should trace, or 0 if the return should
not be traced.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7ee991fbc6f947e9b04f29c9c6c1d057d0671a16
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 23:50:04 2008 -0500
ftrace: print real return in dumpstack for function graph
Impact: better dumpstack output
I noticed in my crash dumps and even in the stack tracer that a
lot of functions listed in the stack trace are simply
return_to_handler which is ftrace graphs way to insert its own
call into the return of a function.
But we lose out where the actually function was called from.
This patch adds in hooks to the dumpstack mechanism that detects
this and finds the real function to print. Both are printed to
let the user know that a hook is still in place.
This does give a funny side effect in the stack tracer output:
Depth Size Location (80 entries)
----- ---- --------
0) 4144 48 save_stack_trace+0x2f/0x4d
1) 4096 128 ftrace_call+0x5/0x2b
2) 3968 16 mempool_alloc_slab+0x16/0x18
3) 3952 384 return_to_handler+0x0/0x73
4) 3568 -240 stack_trace_call+0x11d/0x209
5) 3808 144 return_to_handler+0x0/0x73
6) 3664 -128 mempool_alloc+0x4d/0xfe
7) 3792 128 return_to_handler+0x0/0x73
8) 3664 -32 scsi_sg_alloc+0x48/0x4a [scsi_mod]
As you can see, the real functions are now negative. This is due
to them not being found inside the stack.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 044fa782ebb9472cf5253e95d9a625fd4c0bdd99
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 23:50:03 2008 -0500
ring-buffer: change "page" variable names to "bpage"
Impact: clean up
Andrew Morton pointed out that the kernel convention of a variable
named page should be of type page struct. The ring buffer uses
a variable named "page" for a pointer to something else.
This patch converts those to be called "bpage" (as in "buffer page").
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 14a866c567e040ccf6240d68b083dd1dbbde63e6
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 23:50:02 2008 -0500
ftrace: add ftrace_graph_stop()
Impact: new ftrace_graph_stop function
While developing more features of function graph, I hit a bug that
caused the WARN_ON to trigger in the prepare_ftrace_return function.
Well, it was hard for me to find out that was happening because the
bug would not print, it would just cause a hard lockup or reboot.
The reason is that it is not safe to call printk from this function.
Looking further, I also found that it calls unregister_ftrace_graph,
which grabs a mutex and calls kstop machine. This would definitely
lock the box up if it were to trigger.
This patch adds a fast and safe ftrace_graph_stop() which will
stop the function tracer. Then it is safe to call the WARN ON.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bb4304c71c97bf727ec43cd2f195c2c237c27fd3
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 15:34:09 2008 -0500
ftrace: have function graph use mcount caller address
Impact: consistency change for function graph
This patch makes function graph record the mcount caller address
the same way the function tracer does.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 347fdd9dd4e5d3f3a4e415925c35bdff1d59c3a9
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 15:34:08 2008 -0500
ftrace: clean up function graph asm
Impact: clean up
There exists macros for x86 asm to handle x86_64 and i386.
This patch updates function graph asm to use them.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8789a9e7df6bf9b93739c4c7d4e380725bc9e936
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 15:34:07 2008 -0500
ring-buffer: read page interface
Impact: new API to ring buffer
This patch adds a new interface into the ring buffer that allows a
page to be read from the ring buffer on a given CPU. For every page
read, one must also be given to allow for a "swap" of the pages.
rpage = ring_buffer_alloc_read_page(buffer);
if (!rpage)
goto err;
ret = ring_buffer_read_page(buffer, &rpage, cpu, full);
if (!ret)
goto empty;
process_page(rpage);
ring_buffer_free_read_page(rpage);
The caller of these functions must handle any waits that are
needed to wait for new data. The ring_buffer_read_page will simply
return 0 if there is no data, or if "full" is set and the writer
is still on the current page.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit abc9b56d66fbd4d93302ef4bf6fa726e1b8255f9
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 15:34:06 2008 -0500
ring-buffer: move some metadata into buffer page
Impact: get ready for splice changes
This patch moves the commit and timestamp into the beginning of each
data page of the buffer. This change will allow the page to be moved
to another location (disk, network, etc) and still have information
in the page to be able to read it.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a5e25883a445dce94a087ca479b21a5959cd5c18
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 2 15:34:05 2008 -0500
ftrace: replace raw_local_irq_save with local_irq_save
Impact: fix for lockdep and ftrace
The raw_local_irq_save/restore confuses lockdep. This patch
converts them to the local_irq_save/restore variants.
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit dfdc5437bd62dd6a26961e27f26b671374749875
Merge: f0461d0146ee30927bc7efa2ae24ea8c6693b725
061e41fdb5047b1fb161e89664057835935ca1d2
878719e831d9e076961aa15d4049a57a6668c67a
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 3 08:54:47 2008 +0100
Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes
depend on cleanups already in x86/dumpstack.
Also merge to latest upstream -rc.
commit f0461d0146ee30927bc7efa2ae24ea8c6693b725
Merge: 66eafebc1086014709dc38f52ddcb3d67d9b346c
48d68b20d00865035b8b65e69af343d0f53fac9d
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 3 08:49:21 2008 +0100
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into
tracing/core
commit 181de82ee3ffda1175f89d50c991dae31b79280c
Author: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Date: Wed Dec 3 14:53:04 2008 +0900
x86: remove dead BIO_VMERGE_BOUNDARY definition
Impact: cleanup, remove dead code
The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5).
BIO_VMERGE_BOUNDARY definition is meaningless now.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6083aa485c86933ee444dc2242270d37ea4664cb
Merge: dcb7731a185efbf3d800618d874af99895df5afb
93093d099e5dd0c258fd530c12668e828c20df41
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 3 08:25:56 2008 +0100
Merge branch 'x86/io' into x86/iommu
Merge x86/io into x86/iommu due to a small patch conflict in io.h.
commit 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123
Merge: aa2ba5f1082dc705745899584aac8416d710c056
9a5df92374d65e2886b92e98dd7d873c533a83ff
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 2 22:38:02 2008 -0800
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
commit aa2ba5f1082dc705745899584aac8416d710c056
Merge: 68024541e2e5a8f35e281daaa5068a29e2a538a5
f6f7b52e2f6149d2ee365717afff315b05720162
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 2 19:50:27 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
commit 68024541e2e5a8f35e281daaa5068a29e2a538a5
Merge: ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc
39da5814db81e8fe9782ae5ea24c0fdfcf2adc96
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 2 15:05:06 2008 -0800
Merge branch 'master' of
ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
commit ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Tue Dec 2 15:00:28 2008 -0800
mac8390: update to net_device_ops
Another related 8390 driver. Since this is for nubus, not sure if
anyone still has the hardware?
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b9a9b4b0429d0c0e4655d531a57a6424d972433c
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Tue Dec 2 14:52:25 2008 -0800
etherh: build fix for net-next
Fix build of ARM etherh driver with new net_device_ops.
Signed |