]> pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
17 years agoARM: OMAP2: Clockdomain: Encode OMAP2/3 clockdomains
Paul Walmsley [Tue, 19 Aug 2008 08:08:44 +0000 (11:08 +0300)]
ARM: OMAP2: Clockdomain: Encode OMAP2/3 clockdomains

Add clockdomain definitions for OMAP24xx and OMAP34xx chips.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP2: Clockdomain: Connect clockdomain code to powerdomain code
Paul Walmsley [Tue, 19 Aug 2008 08:08:44 +0000 (11:08 +0300)]
ARM: OMAP2: Clockdomain: Connect clockdomain code to powerdomain code

Thie patch adds code to the powerdomain layer to track the
clockdomains associated with each powerdomain.

It also modifies the clockdomain code to register clockdomains
with their corresponding powerdomain when the clockdomain is registered.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP2: Clockdomain: Add base OMAP2/3 clockdomain code
Paul Walmsley [Tue, 19 Aug 2008 08:08:43 +0000 (11:08 +0300)]
ARM: OMAP2: Clockdomain: Add base OMAP2/3 clockdomain code

This patch creates an interface to the clockdomain registers in the
PRM/CM modules on OMAP2/3.  This interface is intended to be used by
PM code, e.g., pm.c; not by device drivers directly.

The patch also adds clockdomain usecount tracking.  This is intended
to be called whenever the first clock in a clockdomain is enabled, or
when the last enabled clock in a clockdomain is disabled.  If the
clockdomain is in software-supervised mode, the code will force-wakeup
or force-sleep the clockdomain.  If the clockdomain is in
hardware-supervised mode, the first clock enable will add sleep and
wakeup dependencies on a user-selectable set of parent domains (usually
MPU & IVA2), and the disable will remove them.

Each clockdomain will be defined in later patches as static
structures.  The clockdomain structures are linked into a list at boot
by clkdm_register(), similar to the OMAP clock code.

The patch adds a Kconfig option, CONFIG_OMAP_DEBUG_CLOCKDOMAIN, which
when enabled will emit verbose debug messages via pr_debug().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Powerdomain: Add OMAP3 powerdomains
Paul Walmsley [Tue, 19 Aug 2008 08:08:43 +0000 (11:08 +0300)]
ARM: OMAP: Powerdomain: Add OMAP3 powerdomains

Add OMAP3-specific powerdomains.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP2: Powerdomain: Add OMAP2 powerdomains
Paul Walmsley [Tue, 19 Aug 2008 08:08:42 +0000 (11:08 +0300)]
ARM: OMAP2: Powerdomain: Add OMAP2 powerdomains

Add OMAP2-specific powerdomains.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP2: Powerdomain: Add OMAP2/3 common powerdomains
Paul Walmsley [Tue, 19 Aug 2008 08:08:40 +0000 (11:08 +0300)]
ARM: OMAP2: Powerdomain: Add OMAP2/3 common powerdomains

Add powerdomains common to both OMAP2 and OMAP3 (WKUP and GFX/SGX).
Modify mach-omap2/io.c to initialize the powerdomain code on boot.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP2: Powerdomain: Add base OMAP2/3 powerdomain code
Paul Walmsley [Tue, 19 Aug 2008 08:08:40 +0000 (11:08 +0300)]
ARM: OMAP2: Powerdomain: Add base OMAP2/3 powerdomain code

This patch creates an interface to the powerdomain registers in the
PRM/CM modules on OMAP2/3.  This interface is intended to be used by
PM code, e.g., pm.c; not by device drivers directly.

Each powerdomain will be defined in later patches as static
structures.  Also defined are dependencies between powerdomains,
used for adding and removing PM_WKDEP and CM_SLEEPDEP bits.  The
powerdomain structures are linked into a list at boot by
pwrdm_register(), similar to the OMAP clock code.

The patch adds a Kconfig option, CONFIG_OMAP_DEBUG_POWERDOMAIN, which
when enabled will emit verbose debug messages via pr_debug().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agompu401: reindent misindented spinlock
Ilpo Järvinen [Tue, 19 Aug 2008 07:56:33 +0000 (10:56 +0300)]
mpu401: reindent misindented spinlock

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoipvs: Fix race conditions in lblcr scheduler
Sven Wegener [Tue, 19 Aug 2008 06:16:19 +0000 (08:16 +0200)]
ipvs: Fix race conditions in lblcr scheduler

We can't access the cache entry outside of our critical read-locked region,
because someone may free that entry. Also getting an entry under read lock,
then locking for write and trying to delete that entry looks fishy, but should
be no problem here, because we're only comparing a pointer. Also there is no
need for our own rwlock, there is already one in the service structure for use
in the schedulers.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Signed-off-by: Simon Horman <horms@verge.net.au>
17 years agoipvs: Fix race conditions in lblc scheduler
Sven Wegener [Sun, 17 Aug 2008 22:52:08 +0000 (00:52 +0200)]
ipvs: Fix race conditions in lblc scheduler

We can't access the cache entry outside of our critical read-locked region,
because someone may free that entry. And we also need to check in the critical
region wether the destination is still available, i.e. it's not in the trash.
If we drop our reference counter, the destination can be purged from the trash
at any time. Our caller only guarantees that no destination is moved to the
trash, while we are scheduling. Also there is no need for our own rwlock,
there is already one in the service structure for use in the schedulers.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Signed-off-by: Simon Horman <horms@verge.net.au>
17 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Simon Horman [Tue, 19 Aug 2008 07:36:22 +0000 (17:36 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

17 years agotwl3040-gpio: fix task softlockup warning
Artem Bityutskiy [Mon, 18 Aug 2008 15:54:57 +0000 (18:54 +0300)]
twl3040-gpio: fix task softlockup warning

This patch fixes the following annoying warning:

INFO: task twl4030 gpio:283 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
twl4030 gpio  D c027e9dc     0   283      2
[<c027e744>] (schedule+0x0/0x314) from [<c00640f0>] (kthread+0x3c/0x80)
[<c00640b4>] (kthread+0x0/0x80) from [<c0052678>] (do_exit+0x0/0x664)
 r5:00000000 r4:00000000

Which is printed every 120 seconds by the softlockup code (see
'check_hung_task()' function, introduced by on Jan 2008 by commit
82a1fcb90287052aabfa235e7ffc693ea003fe69).

The reason is that the "twl4030 gpio" kthread is created but is not started
immediatelly. And in fact it may never start, because TWL3040 interrupts
may never happen and hence, the 'twl4030_gpio_unmask_irqchip()' function
is never run. This makes the softlockup detection code unhappy.

Fix this by running the "twl4030 gpio" kernel thread in at the end of the
'gpio_twl4030_init()' initialization function. Since the 'gpio_pending_unmask'
global variable is 0 at that time, the tread ('twl4030_gpio_unmask_thread()')
will effectively do nothing and go sleep. This makes the softlocup detection
code happy.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoRevert "pkt_sched: Add BH protection for qdisc_stab_lock."
David S. Miller [Tue, 19 Aug 2008 05:33:05 +0000 (22:33 -0700)]
Revert "pkt_sched: Add BH protection for qdisc_stab_lock."

This reverts commit 1cfa26661a85549063e369e2b40275eeaa7b923c.

qdisc_destroy() runs fully under RTNL again and not from softint any
longer, so this change is no longer needed.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoRevert "pkt_sched: Protect gen estimators under est_lock."
David S. Miller [Tue, 19 Aug 2008 05:32:10 +0000 (22:32 -0700)]
Revert "pkt_sched: Protect gen estimators under est_lock."

This reverts commit d4766692e72422f3b0f0e9ac6773d92baad07d51.

qdisc_destroy() now runs in RTNL fully again, so this
change is no longer needed.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agopkt_sched: remove bogus block (cleanup)
Ilpo Järvinen [Tue, 19 Aug 2008 05:30:01 +0000 (22:30 -0700)]
pkt_sched: remove bogus block (cleanup)

...Last block local var got just deleted.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agonf_nat: use secure_ipv4_port_ephemeral() for NAT port randomization
Stephen Hemminger [Tue, 19 Aug 2008 04:32:32 +0000 (21:32 -0700)]
nf_nat: use secure_ipv4_port_ephemeral() for NAT port randomization

Use incoming network tuple as seed for NAT port randomization.
This avoids concerns of leaking net_random() bits, and also gives better
port distribution. Don't have NAT server, compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
[ added missing EXPORT_SYMBOL_GPL ]

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agonetfilter: ctnetlink: sleepable allocation with spin lock bh
Pablo Neira Ayuso [Tue, 19 Aug 2008 04:31:46 +0000 (21:31 -0700)]
netfilter: ctnetlink: sleepable allocation with spin lock bh

This patch removes a GFP_KERNEL allocation while holding a spin lock with
bottom halves disabled in ctnetlink_change_helper().

This problem was introduced in 2.6.23 with the netfilter extension
infrastructure.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agonetfilter: ctnetlink: fix sleep in read-side lock section
Pablo Neira Ayuso [Tue, 19 Aug 2008 04:31:24 +0000 (21:31 -0700)]
netfilter: ctnetlink: fix sleep in read-side lock section

Fix allocation with GFP_KERNEL in ctnetlink_create_conntrack() under
read-side lock sections.

This problem was introduced in 2.6.25.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agonetfilter: ctnetlink: fix double helper assignation for NAT'ed conntracks
Pablo Neira Ayuso [Tue, 19 Aug 2008 04:30:55 +0000 (21:30 -0700)]
netfilter: ctnetlink: fix double helper assignation for NAT'ed conntracks

If we create a conntrack that has NAT handlings and a helper, the helper
is assigned twice. This happens because nf_nat_setup_info() - via
nf_conntrack_alter_reply() - sets the helper before ctnetlink, which
indeed does not check if the conntrack already has a helper as it thinks that
it is a brand new conntrack.

The fix moves the helper assignation before the set of the status flags.
This avoids a bogus assertion in __nf_ct_ext_add (if netfilter assertions are
enabled) which checks that the conntrack must not be confirmed.

This problem was introduced in 2.6.23 with the netfilter extension
infrastructure.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
17 years agonetfilter: ipt_addrtype: Fix matching of inverted destination address type
Anders Grafström [Tue, 19 Aug 2008 04:29:57 +0000 (21:29 -0700)]
netfilter: ipt_addrtype: Fix matching of inverted destination address type

This patch fixes matching of inverted destination address type.

Signed-off-by: Anders Grafström <grfstrm@users.sourceforge.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Tue, 19 Aug 2008 04:15:44 +0000 (21:15 -0700)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

17 years agodccp: Fix panic caused by too early termination of retransmission mechanism
Gerrit Renker [Tue, 19 Aug 2008 04:14:20 +0000 (21:14 -0700)]
dccp: Fix panic caused by too early termination of retransmission mechanism

Thanks is due to Wei Yongjun for the detailed analysis and description of this
bug at http://marc.info/?l=dccp&m=121739364909199&w=2

The problem is that invalid packets received by a client in state REQUEST cause
the retransmission timer for the DCCP-Request to be reset. This includes freeing
the Request-skb ( in dccp_rcv_request_sent_state_process() ). As a consequence,
 * the arrival of further packets cause a double-free, triggering a panic(),
 * the connection then may hang, since further retransmissions are blocked.

This patch changes the order of statements so that the retransmission timer is
reset, and the pending Request freed, only if a valid Response has arrived (or
the number of sysctl-retries has been exhausted).

Further changes:
----------------
To be on the safe side, replaced __kfree_skb with kfree_skb so that if due to
unexpected circumstances the sk_send_head is NULL the WARN_ON is used instead.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agopkt_sched: Don't hold qdisc lock over qdisc_destroy().
David S. Miller [Tue, 19 Aug 2008 04:03:15 +0000 (21:03 -0700)]
pkt_sched: Don't hold qdisc lock over qdisc_destroy().

Based upon reports by Denys Fedoryshchenko, and feedback
and help from Jarek Poplawski and Herbert Xu.

We always either:

1) Never made an external reference to this qdisc.

or

2) Did a dev_deactivate() which purged all asynchronous
   references.

So do not lock the qdisc when we call qdisc_destroy(),
it's illegal anyways as when we drop the lock this is
free'd memory.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agopkt_sched: Add lockdep annotation for qdisc locks
Jarek Poplawski [Tue, 19 Aug 2008 03:53:34 +0000 (20:53 -0700)]
pkt_sched: Add lockdep annotation for qdisc locks

Qdisc locks are initialized in the same function, qdisc_alloc(), so
lockdep can't distinguish tx qdisc lock from rx and reports "possible
recursive locking detected" when both these locks are taken eg. while
using act_mirred with ifb. This looks like a false positive. Anyway,
after this patch these locks will be reported more exactly.

Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agopkt_sched: Never schedule non-root qdiscs.
David S. Miller [Tue, 19 Aug 2008 03:51:18 +0000 (20:51 -0700)]
pkt_sched: Never schedule non-root qdiscs.

Based upon initial discovery and patch by Jarek Poplawski.

The qdisc watchdogs can be attached to any qdisc, not just the root,
so make sure we schedule the correct one.

CBQ has a similar bug.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agorcu: fix locking cleanup fallout
Paul E. McKenney [Tue, 19 Aug 2008 00:51:08 +0000 (17:51 -0700)]
rcu: fix locking cleanup fallout

Given that the rcp->lock is now acquired from call_rcu(), which can be
invoked from irq-disable regions, all acquisitions need to disable irqs.
The following patch fixes this.

Although I don't have any reason to believe that this is the cause of
Yinghai's oops, it does need to be fixed.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge branch 'x86/oprofile' into oprofile
Ingo Molnar [Tue, 19 Aug 2008 01:34:07 +0000 (03:34 +0200)]
Merge branch 'x86/oprofile' into oprofile

17 years agox86: Coding style fixes to arch/x86/oprofile/op_model_p4.c
Paolo Ciarrocchi [Mon, 18 Aug 2008 19:25:38 +0000 (21:25 +0200)]
x86: Coding style fixes to arch/x86/oprofile/op_model_p4.c

A coding style patch to arch/x86/oprofile/op_model_p4.c that
removes 87 errors and 4 warnings.

Before:
total: 89 errors, 13 warnings, 722 lines checked

After:
total: 2 errors, 9 warnings, 721 lines checked

Compile tested, binary verified as follow:

paolo@paolo-desktop:~/linux.trees.git$ size /tmp/op_model_p4.o.*
   text    data     bss     dec     hex filename
   2691     968      32    3691     e6b /tmp/op_model_p4.o.after
   2691     968      32    3691     e6b /tmp/op_model_p4.o.before

paolo@paolo-desktop:~/linux.trees.git$ md5sum /tmp/op_model_p4.o.*
8c1c9823bab33333e1f7f76574e62561  /tmp/op_model_p4.o.after
8c1c9823bab33333e1f7f76574e62561  /tmp/op_model_p4.o.before

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Cc: robert.richter@amd.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: <asm/asm.h> consistency cleanups
H. Peter Anvin [Tue, 19 Aug 2008 01:13:33 +0000 (18:13 -0700)]
x86: <asm/asm.h> consistency cleanups

Rename _ASM_MOV_UL to _ASM_MOV for consistency with other _ASM_
instructions (_ASM_ADD, _ASM_SUB and so on.)

Add ASM_SP, _ASM_BP, _ASM_SI, and _ASM_DI for consistency with
_ASM_[ABCD]X.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: use X86_FEATURE_NOPL in alternatives
H. Peter Anvin [Tue, 19 Aug 2008 00:50:33 +0000 (17:50 -0700)]
x86: use X86_FEATURE_NOPL in alternatives

Use X86_FEATURE_NOPL to determine if it is safe to use P6 NOPs in
alternatives.  Also, replace table and loop with simple if statement.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: add NOPL as a synthetic CPU feature bit
H. Peter Anvin [Tue, 19 Aug 2008 00:39:32 +0000 (17:39 -0700)]
x86: add NOPL as a synthetic CPU feature bit

The long noops ("NOPL") are supposed to be detected by family >= 6.
Unfortunately, several non-Intel x86 implementations, both hardware
and software, don't obey this dictum.  Instead, probe for NOPL
directly by executing a NOPL instruction and see if we get #UD.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: boot: stub out unimplemented CPU feature words
H. Peter Anvin [Fri, 15 Aug 2008 22:36:31 +0000 (15:36 -0700)]
x86: boot: stub out unimplemented CPU feature words

The CPU feature detection code in the boot code is somewhat minimal,
and doesn't include all possible CPUID words.  In particular, it
doesn't contain the code for CPU feature words 2 (Transmeta),
3 (Linux-specific), 5 (VIA), or 7 (scattered).  Zero them out, so we
can still set those bits as known at compile time; in particular, this
allows creating a Linux-specific NOPL flag and have it required (and
therefore resolvable at compile time) in 64-bit mode.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Tue, 19 Aug 2008 00:43:21 +0000 (17:43 -0700)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] use generic compat_old_sys_readdir
  [IA64] pci_acpi_scan_root cleanup
  [IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.
  [IA64] Remove sn2_defconfig.

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Tue, 19 Aug 2008 00:40:13 +0000 (17:40 -0700)]
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:
  ata: add missing ATA_* defines
  ata: add missing ATA_CMD_* defines
  ata: add missing ATA_ID_* defines (take 2)
  sgiioc4: fixup message on resource allocation failure
  ide-cd: use bcd2bin/bin2bcd
  cdrom: handle TOC
  gdrom: add dummy audio_ioctl handler
  viocd: add dummy audio ioctl handler
  cleanup powerpc/include/asm/ide.h
  drivers/ide/pci/: use __devexit_p()

17 years agoMerge branch 'x86-merge' into for-linus
Jesse Barnes [Tue, 19 Aug 2008 00:23:24 +0000 (17:23 -0700)]
Merge branch 'x86-merge' into for-linus

17 years agox86 iommu: remove unneeded parenthesis
Jiri Kosina [Tue, 19 Aug 2008 00:13:55 +0000 (02:13 +0200)]
x86 iommu: remove unneeded parenthesis

The parenthesis in __iommu_queue_command() are not needed when assigning
into 'target' variable.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: early_printk.c trivial sparse fixes
Harvey Harrison [Mon, 18 Aug 2008 23:56:29 +0000 (16:56 -0700)]
x86: early_printk.c trivial sparse fixes

arch/x86/kernel/early_printk.c:404:13: warning: incorrect type in assignment (different base types)
arch/x86/kernel/early_printk.c:404:13:    expected restricted __le16 [assigned] [usertype] wValue
arch/x86/kernel/early_printk.c:404:13:    got int [signed] value
arch/x86/kernel/early_printk.c:405:13: warning: incorrect type in assignment (different base types)
arch/x86/kernel/early_printk.c:405:13:    expected restricted __le16 [assigned] [usertype] wIndex
arch/x86/kernel/early_printk.c:405:13:    got int [signed] index
arch/x86/kernel/early_printk.c:406:14: warning: incorrect type in assignment (different base types)
arch/x86/kernel/early_printk.c:406:14:    expected restricted __le16 [assigned] [usertype] wLength
arch/x86/kernel/early_printk.c:406:14:    got int [signed] size
arch/x86/kernel/early_printk.c:845:16: warning: Using plain integer as NULL pointer
arch/x86/kernel/early_printk.c:992:13: warning: symbol 'enable_debug_console' was not declared. Should it be static?

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - compilation warnings fix
Cyrill Gorcunov [Mon, 18 Aug 2008 19:12:33 +0000 (23:12 +0400)]
x86: apic - compilation warnings fix

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - lapic_resume 32bit - unification fix
Cyrill Gorcunov [Mon, 18 Aug 2008 16:46:03 +0000 (20:46 +0400)]
x86: apic - lapic_resume 32bit - unification fix

Just add parenthesis to be identical of current
64bit implementation (so diff will not complain).

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - rearrange parse_lapic_timer_c2_ok
Cyrill Gorcunov [Mon, 18 Aug 2008 16:46:02 +0000 (20:46 +0400)]
x86: apic - rearrange parse_lapic_timer_c2_ok

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify disableapic and nolapic setup handlers
Cyrill Gorcunov [Mon, 18 Aug 2008 16:46:01 +0000 (20:46 +0400)]
x86: apic - unify disableapic and nolapic setup handlers

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify apic_set_verbosity
Cyrill Gorcunov [Mon, 18 Aug 2008 16:46:00 +0000 (20:46 +0400)]
x86: apic - unify apic_set_verbosity

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify local_apic_timer_interrupt
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:59 +0000 (20:45 +0400)]
x86: apic - unify local_apic_timer_interrupt

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify end_local_APIC_setup
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:58 +0000 (20:45 +0400)]
x86: apic - unify end_local_APIC_setup

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - generic_processor_info
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:57 +0000 (20:45 +0400)]
x86: apic - generic_processor_info

- use physid_set instead of phys_cpu and physids_or
- set phys_cpu_present_map bit AFTER check for allowed
  number of processors
- add checking for APIC valid version in 64bit mode
  (mostly not needed but added for merging purpose)
- add apic_version definition for 64bit mode which
  is used now

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify disconnect_bsp_APIC
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:56 +0000 (20:45 +0400)]
x86: apic - unify disconnect_bsp_APIC

- just #ifdef added

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify __setup_APIC_LVTT
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:55 +0000 (20:45 +0400)]
x86: apic - unify __setup_APIC_LVTT

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify lapic_setup_esr
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:54 +0000 (20:45 +0400)]
x86: apic - unify lapic_setup_esr

We use 32bit code former for 64bit
mode since it's much better implementation
and easier to merge.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify connect_bsp_APIC
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:53 +0000 (20:45 +0400)]
x86: apic - unify connect_bsp_APIC

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify lapic_shutdown
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:52 +0000 (20:45 +0400)]
x86: apic - unify lapic_shutdown

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify disable_local_APIC
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:51 +0000 (20:45 +0400)]
x86: apic - unify disable_local_APIC

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - unify setup_boot_APIC_clock
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:50 +0000 (20:45 +0400)]
x86: apic - unify setup_boot_APIC_clock

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: apic - rearrange maxcpu definition
Cyrill Gorcunov [Mon, 18 Aug 2008 16:45:49 +0000 (20:45 +0400)]
x86: apic - rearrange maxcpu definition

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years ago[IA64] use generic compat_old_sys_readdir
Christoph Hellwig [Sat, 16 Aug 2008 17:50:28 +0000 (19:50 +0200)]
[IA64] use generic compat_old_sys_readdir

Switch ia64 to the generic compat_sys_old_readdir which is identical
except for slightly better error handling.  Also remove sys32_getdents
which already isn't wired up to the syscall table anymore in favour of
compat_sys_getdents.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
17 years ago[IA64] pci_acpi_scan_root cleanup
Luck, Tony [Fri, 15 Aug 2008 22:37:48 +0000 (15:37 -0700)]
[IA64] pci_acpi_scan_root cleanup

The code walks all the acpi _CRS methods to see how many windows
to allocate.  It then scans them all again to insert_resource()
for each *even if the first scan found that there were none*.

Move the second scan inside the "if (windows)" clause.

Signed-off-by: Tony Luck <tony.luck@intel.com>
17 years ago[IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.
Robin Holt [Fri, 15 Aug 2008 14:21:24 +0000 (09:21 -0500)]
[IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.

Making allmodconfig will break the current build.  This patch shrinks
the per_cpu__shadow_flush_counts from 16k to 8k which frees enough space
to allow allmodconfig to successfully complete.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=11338

Signed-off-by: Robin Holt <holt@sgi.com>
Acked-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
17 years ago[IA64] Remove sn2_defconfig.
Robin Holt [Fri, 15 Aug 2008 09:56:01 +0000 (04:56 -0500)]
[IA64] Remove sn2_defconfig.

Not really a patch as much as a remove this file request.  Now that
generic_defconfig supports all the configurations SGI currently supports
and has NR_CPUS and NR_NODES at our largest configurations, we have no
reason to maintain the extra defconfig file.

Signed-off-by: Robin Holt <holt@sgi.com>
Acked-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
17 years agoMerge branch 'for_rmk_17' of git://git.mnementh.co.uk/linux-2.6-im
Russell King [Mon, 18 Aug 2008 21:17:37 +0000 (22:17 +0100)]
Merge branch 'for_rmk_17' of git://git.mnementh.co.uk/linux-2.6-im

17 years agoPCI: add acpi_find_root_bridge_handle
Jiri Slaby [Mon, 18 Aug 2008 18:22:54 +0000 (20:22 +0200)]
PCI: add acpi_find_root_bridge_handle

Consolidate finding of a root bridge and getting its handle to the one
inline function. It's cut & pasted on multiple places. Use this new
inline in those.

Cc: kristen.c.accardi@intel.com
Acked-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
17 years agoPCI: acpi_pcihp: run _OSC on a root bridge
Jiri Slaby [Mon, 11 Aug 2008 15:47:40 +0000 (17:47 +0200)]
PCI: acpi_pcihp: run _OSC on a root bridge

_OSC should be ran on a root bridge instead of the device itself.  Do
this before touching OSHP since PCI fw specs states that _OSC should be
preferred over OSHP (however if the device has OSHP but not _OSC -- not
a root bridge -- it's not).

Cc: kristen.c.accardi@intel.com
Acked-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
17 years agoata: add missing ATA_* defines
Bartlomiej Zolnierkiewicz [Mon, 18 Aug 2008 19:40:05 +0000 (21:40 +0200)]
ata: add missing ATA_* defines

Add missing ATA_* defines to <linux/ata.h>.  Also add
ATAPI_{LFS,EOM,ILI,IO,CODE} defines while at it.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agoata: add missing ATA_CMD_* defines
Bartlomiej Zolnierkiewicz [Mon, 18 Aug 2008 19:40:05 +0000 (21:40 +0200)]
ata: add missing ATA_CMD_* defines

Add missing ATA_CMD_* defines to <linux/ata.h>.  Also add
ATA_EXABYTE_ENABLE_NEST, SETFEATURES_AAM_* and ATA_SMART_*
defines while at it.

Partially based on earlier work by Chris Wedgwood.

Acked-by: Chris Wedgwood <cw@f00f.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agoata: add missing ATA_ID_* defines (take 2)
Bartlomiej Zolnierkiewicz [Mon, 18 Aug 2008 19:40:05 +0000 (21:40 +0200)]
ata: add missing ATA_ID_* defines (take 2)

Add missing ATA_ID_* defines and update {ata,atapi}_*()
inlines accordingly.  The currently unused defines are
needed for the forthcoming drivers/ide/ changes.

v2:
Add ATA_ID_SPG.

Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agosgiioc4: fixup message on resource allocation failure
Bartlomiej Zolnierkiewicz [Mon, 18 Aug 2008 19:40:04 +0000 (21:40 +0200)]
sgiioc4: fixup message on resource allocation failure

There can be more than one sgiioc4 card in the system so print
also PCI device name on resource allocation failure (so we know
which one is the problematic one).

Reported-by: Jeremy Higdon <jeremy@sgi.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agoide-cd: use bcd2bin/bin2bcd
Adrian Bunk [Mon, 18 Aug 2008 19:40:04 +0000 (21:40 +0200)]
ide-cd: use bcd2bin/bin2bcd

Change ide-cd to use the new bcd2bin/bin2bcd functions instead of the
obsolete BCD2BIN/BIN2BCD macros.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agocdrom: handle TOC
Alexander Inyukhin [Mon, 18 Aug 2008 19:40:04 +0000 (21:40 +0200)]
cdrom: handle TOC

This patch should fix TOC handling for cdroms that can not play audio.  It
extends commit af744e3294d09d706c4eae26cffaaa68a8d40337 ("cdrom: don't
check CDC_PLAY_AUDIO in cdrom_count_tracks()") with a safety check and
non-audio ioctls support.

Since CDC_PLAY_AUDIO flag was used not only to check ability to play audio
but also to ensure that audio_ioctl was not NULL, all TOC-related
operations had to use it.

As far as I understand, now audio_ioctl is never NULL, so a sanity check
during device registration should be sufficient.

It was tested on Optiarc AD7203A device, that has no ability to play
audio.

Cc: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Borislav Petkov <petkovbb@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[bart: remove now unneeded ->audio_ioctl check (noticed by Borislav)]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agogdrom: add dummy audio_ioctl handler
Borislav Petkov [Mon, 18 Aug 2008 19:40:04 +0000 (21:40 +0200)]
gdrom: add dummy audio_ioctl handler

Make sure audio_ioctl is always defined even if being a dummy function
since the cdrom_ioctl interface assumes its existence and we don't
want to BUG on null ptr on some ioctls like, e.g. CDROMREADTOCENTRY,
CDROMREADTOCHDR etc. when we fix CDC_PLAY_AUDIO checking in cdrom.c.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agoviocd: add dummy audio ioctl handler
Borislav Petkov [Mon, 18 Aug 2008 19:40:03 +0000 (21:40 +0200)]
viocd: add dummy audio ioctl handler

Make sure audio_ioctl is always defined even if being a dummy function
since the cdrom_ioctl interface assumes its existence and we don't
want to BUG on null ptr on some ioctls like, e.g. CDROMREADTOCENTRY,
CDROMREADTOCHDR etc. when we fix CDC_PLAY_AUDIO checking in cdrom.c.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agocleanup powerpc/include/asm/ide.h
Adrian Bunk [Mon, 18 Aug 2008 19:40:03 +0000 (21:40 +0200)]
cleanup powerpc/include/asm/ide.h

This patch removes code that became unused through IDE changes and the
arch/ppc/ removal.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agodrivers/ide/pci/: use __devexit_p()
Adrian Bunk [Mon, 18 Aug 2008 19:40:03 +0000 (21:40 +0200)]
drivers/ide/pci/: use __devexit_p()

This patch adds missing __devexit_p's.

Reported-by: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
17 years agoMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 18 Aug 2008 19:10:14 +0000 (12:10 -0700)]
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: fix build warnings in real mode code
  x86, calgary: fix section mismatch warning - get_tce_space_from_tar
  x86: silence section mismatch warning - get_local_pda
  x86, percpu: silence section mismatch warnings related to EARLY_PER_CPU variables
  x86: fix i486 suspend to disk CR4 oops
  x86: mpparse.c: fix section mismatch warning
  x86: mmconf: fix section mismatch warning
  x86: fix MP_processor_info section mismatch warning
  x86, tsc: fix section mismatch warning
  x86: correct register constraints for 64-bit atomic operations

17 years agoMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 18 Aug 2008 19:09:56 +0000 (12:09 -0700)]
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: fix spurious 'inconsistent lock state' warning

17 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Mon, 18 Aug 2008 19:05:01 +0000 (12:05 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Use generic compat_sys_old_readdir
  powerpc/kexec: Fix up KEXEC_CONTROL_CODE_SIZE missed during conversion
  powerpc: Remove dead module_find_bug code
  powerpc: Add CMO enabled flag and paging space data to lparcfg
  powerpc: Fix CMM page loaning on 64k page kernel with 4k hardware pages
  powerpc: Make CMO paging space pool ID and page size available
  powerpc: Fix lockdep IRQ tracing bug
  powerpc: Fix TLB invalidation on boot on 32-bit
  powerpc: Fix loss of vdso on fork on 32-bit

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 18 Aug 2008 19:03:23 +0000 (12:03 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  lmb: Fix reserved region handling in lmb_enforce_memory_limit().
  sparc64: Fix cmdline_memory_size handling bugs.
  sparc64: Fix overshoot in nid_range().

17 years agoMerge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
Jesse Barnes [Mon, 18 Aug 2008 16:54:13 +0000 (09:54 -0700)]
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into x86-merge

Conflicts:

drivers/pci/probe.c

17 years ago[JFFS2] Fill in f_fsid field in jffs2_statfs()
David Woodhouse [Mon, 18 Aug 2008 15:23:53 +0000 (16:23 +0100)]
[JFFS2] Fill in f_fsid field in jffs2_statfs()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
17 years agoremoved unused #include <version.h>
Huang Weiyi [Sat, 16 Aug 2008 23:50:47 +0000 (07:50 +0800)]
removed unused #include <version.h>

The drivers below do not use LINUX_VERSION_CODE nor KERNEL_VERSION.
  drivers/net/wireless/ath5k/base.c
  drivers/net/wireless/b43/main.c
  drivers/net/wireless/ipw2100.c
  drivers/net/wireless/ipw2200.c
  drivers/net/wireless/iwlwifi/iwl-3945.c
  drivers/net/wireless/iwlwifi/iwl-4965.c
  drivers/net/wireless/iwlwifi/iwl-5000.c
  drivers/net/wireless/iwlwifi/iwl-agn.c
  drivers/net/wireless/iwlwifi/iwl-core.c
  drivers/net/wireless/iwlwifi/iwl-eeprom.c
  drivers/net/wireless/iwlwifi/iwl-hcmd.c
  drivers/net/wireless/iwlwifi/iwl-power.c
  drivers/net/wireless/iwlwifi/iwl3945-base.c

This patch removes the said #include <version.h>.

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agort2x00: Fix txdone_entry_desc_flags
Jochen Friedrich [Fri, 15 Aug 2008 12:47:46 +0000 (14:47 +0200)]
rt2x00: Fix txdone_entry_desc_flags

txdone_entry_desc_flags is used with __set_bit and test_bit which
bit-shift the values, so don't bit-shift the flags in the enum.
Also make sure flags are initialized before being used.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agob43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306
Larry Finger [Thu, 14 Aug 2008 23:57:11 +0000 (18:57 -0500)]
b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306

In trying to help users on the Ubuntu Bugzilla, I discovered another
BCM4306 with the Bluetooth Coexistence programming error in the SPROM.

This patch is contingent on the one that added the Linksys device with
subdevice code of 0x0014.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agomac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE
Luis R. Rodriguez [Thu, 14 Aug 2008 18:43:20 +0000 (11:43 -0700)]
mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE

IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE was made unnecessary in
the recent revamp on beacon configuration.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agop54u: reset skb's data/tail pointer on requeue
Christian Lamparter [Wed, 13 Aug 2008 21:41:48 +0000 (23:41 +0200)]
p54u: reset skb's data/tail pointer on requeue

(Only important for USB V1 Adaptors)

If an incoming frame wasn't accepted by p54_rx function
the skb will be reused for new frames...

But, we must not forget to set the skb's data pointers into
the same state in which it was initialized by p54u_init_urbs.

Otherwise we either end up with 16 bytes less on every requeue,
or if a new frame is worthy enough to be accepted, the data is
in the wrong place (urb->transfer_buffer wasn't updated!) and mac80211
has a hard time to recognize it...

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agop54: move p54_vdcf_init to the right place.
Christian Lamparter [Wed, 13 Aug 2008 21:41:45 +0000 (23:41 +0200)]
p54: move p54_vdcf_init to the right place.

priv->tx_hdr_len is set by the driver _after_ it called p54_init_common.
While this isn't much a problem for any PCI or ISL3887 cards/sticks,
because they don't need any extra header and therefore tx_hdr_len is
zero for them...

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agoiwlwifi: fix printk newlines
Jiri Slaby [Mon, 11 Aug 2008 21:49:41 +0000 (23:49 +0200)]
iwlwifi: fix printk newlines

Add newlines at printk outputs to not break dmesg.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Zhu Yi <yi.zhu@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agortl8187: Add USB ID for Netgear WG111V3
matthieu Barthélemy [Mon, 11 Aug 2008 04:34:59 +0000 (23:34 -0500)]
rtl8187: Add USB ID for Netgear WG111V3

Add the USB ID for a Netgear WG111v3.

Signed-off-by: matthieu Barthélemy <bonsouere@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agob43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3)
Larry Finger [Sun, 10 Aug 2008 15:19:33 +0000 (10:19 -0500)]
b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3)

The Linksys WMP54G (BCM4306/3) card in a PCI format has an SPROM coding
error and needs the fix found for several other cards.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agomac80211: update new sta's rx timestamp
Ron Rindjunsky [Sat, 9 Aug 2008 21:54:34 +0000 (00:54 +0300)]
mac80211: update new sta's rx timestamp

This patch fixes needless probe request caused by zero value in
sta->last_rx inside ieee80211_associated flow

Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agoath5k: Don't fiddle with MSI on suspend/resume.
Michael Karcher [Thu, 7 Aug 2008 17:34:01 +0000 (19:34 +0200)]
ath5k: Don't fiddle with MSI on suspend/resume.

Commit 256b152b005e319f985f50f2a910a75ba0def74f (ath5k: don't enable
MSI, we cannot handle it yet) has removed msi support, but overlooked
the suspend/resume code. This patch completes msi removal.

I don't consider this patch copyrightable, and thus put it into the
public domain. The result is of course a base.c file dual-licensed under
3-clause-BSD and GPL.

Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agossb: allow compilation on systems without PCI
Holger Schurig [Thu, 7 Aug 2008 16:24:12 +0000 (18:24 +0200)]
ssb: allow compilation on systems without PCI

Makes ssb work on system without a PCI bus.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agorfkill: protect suspended rfkill controllers
Henrique de Moraes Holschuh [Sat, 2 Aug 2008 17:56:25 +0000 (14:56 -0300)]
rfkill: protect suspended rfkill controllers

Guard rfkill controllers attached to a rfkill class against state changes
after class suspend has been issued.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agop54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option"
Christian Lamparter [Sun, 10 Aug 2008 00:20:47 +0000 (19:20 -0500)]
p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option"

Commit b19fa1f, entitled "net: Delete NETDEVICES_MULTIQUEUE kconfig
option" breaks p54pci and p54usb.

Additionally, the old logic always tx'ed cts frames (if enabled)
with a short preamble when [rate > 3]. (i.e. with any 802.11g rate).
Of course this isn't that bad, but it's still wrong!

(This patch also clarifies the meanings of some of the fields in the tx
header for the hardware. -- JWL)

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: <stable@kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agoath9k: work around gcc ICEs (again)
Adrian Bunk [Tue, 5 Aug 2008 19:06:51 +0000 (22:06 +0300)]
ath9k: work around gcc ICEs (again)

(I missed the fact that the original post said to apply this patch
twice... -- JWL)

Original commit log message:

This patch works around an internal compiler error (gcc bug #37014) in
all gcc 4.2 compilers and the gcc 4.3 series up to at least 4.3.1
on at least powerpc and mips.

Many thanks to Andrew Pinski for analyzing the gcc bug.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agoInput: remove version.h from drivers that don't need it
Huang Weiyi [Mon, 18 Aug 2008 14:57:10 +0000 (10:57 -0400)]
Input: remove version.h from drivers that don't need it

If a driver dies not use LINUX_VERSION_CODE nor KERNEL_VERSION
then it does not need to include version.h

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: cobalt_btns - add missing MODULE_LICENSE
Martin Michlmayr [Fri, 15 Aug 2008 19:06:21 +0000 (15:06 -0400)]
Input: cobalt_btns - add missing MODULE_LICENSE

Export the module license and other information about the Cobalt
button module in order to avoid the following warning:

| WARNING: modpost: missing MODULE_LICENSE() in drivers/input/misc/cobalt_btns.o

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agox86: configuration options to compile out x86 CPU support code
Thomas Petazzoni [Tue, 5 Aug 2008 09:45:19 +0000 (11:45 +0200)]
x86: configuration options to compile out x86 CPU support code

This patch adds some configuration options that allow to compile out
CPU vendor-specific code in x86 kernels (in arch/x86/kernel/cpu). The
new configuration options are only visible when CONFIG_EMBEDDED is
selected, as they are mostly interesting for space savings reasons.

An example of size saving, on x86 with only Intel CPU support:

   text    data     bss     dec     hex filename
1125479  118760  212992 1457231  163c4f vmlinux.old
1121355  116536  212992 1450883  162383 vmlinux
  -4124   -2224       0   -6348   -18CC +/-

However, I'm not exactly sure that the Kconfig wording is correct with
regard to !64BIT / 64BIT.

[ mingo@elte.hu: convert macro to inline ]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: move cmpxchg fallbacks to a generic place
Thomas Petazzoni [Mon, 18 Aug 2008 10:33:21 +0000 (12:33 +0200)]
x86: move cmpxchg fallbacks to a generic place

arch/x86/kernel/cpu/intel.c defines a few fallback functions
(cmpxchg_*()) that are used when the CPU doesn't support cmpxchg
and/or cmpxchg64 natively. However, while defined in an Intel-specific
file, these functions are also used for CPUs from other vendors when
they don't support cmpxchg and/or cmpxchg64. This breaks the
compilation when support for Intel CPUs is disabled.

This patch moves these functions to a new
arch/x86/kernel/cpu/cmpxchg.c file, unconditionally compiled when
X86_32 is enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: michael@free-electrons.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: make movsl_mask definition non-CPU specific
Thomas Petazzoni [Mon, 18 Aug 2008 10:33:20 +0000 (12:33 +0200)]
x86: make movsl_mask definition non-CPU specific

movsl_mask is currently defined in arch/x86/kernel/cpu/intel.c, which
contains code specific to Intel CPUs. However, movsl_mask is used in
the non-CPU specific code in arch/x86/lib/usercopy_32.c, which breaks
the compilation when support for Intel CPUs is compiled out.

This patch solves this problem by moving movsl_mask's definition close
to its users in arch/x86/lib/usercopy_32.c.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: michael@free-electrons.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoARCH: OMAP: MUSB: Do not block sleep
Felipe Balbi [Fri, 15 Aug 2008 07:49:41 +0000 (10:49 +0300)]
ARCH: OMAP: MUSB: Do not block sleep

arch: omap: usb: do not block sleep

musb_set_clock should not block sleep on omap3-based
boards, it prevents system from sleeping.

Thanks to Jouni Högander for pointing this out

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years ago[ARM] fix impd1.c build warning
Russell King [Tue, 5 Aug 2008 09:36:00 +0000 (10:36 +0100)]
[ARM] fix impd1.c build warning

  CC      arch/arm/mach-integrator/impd1.o
arch/arm/mach-integrator/impd1.c: In function `impd1_probe':
arch/arm/mach-integrator/impd1.c:408: warning: too few arguments for format

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agoinput: keypad: General fixes to omap-twl4030keypad.c
Felipe Balbi [Thu, 14 Aug 2008 14:06:00 +0000 (17:06 +0300)]
input: keypad: General fixes to omap-twl4030keypad.c

The following patch fixes some problems in T2 keypad
driver.

Basically we're passing irq number via platform_data,
moving globals to a structure and fixing a problem
while iterating over the keymap.

It might be that we still have a few locking issues
that might be solved on a later version of this same
patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoOneNAND OMAP3: add delay for GPIO
Adrian Hunter [Thu, 14 Aug 2008 11:00:12 +0000 (14:00 +0300)]
OneNAND OMAP3: add delay for GPIO

On OMAP3, the driver was occasionally not seeing the GPIO
interrupt.  Adding a small delay of one register read
eliminates the problem.

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>