]> err.no Git - linux-2.6/log
linux-2.6
18 years ago[ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines
Ben Dooks [Wed, 26 Jul 2006 19:16:39 +0000 (20:16 +0100)]
[ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines

Patch from Ben Dooks

Tidy the syntax, such as missing ,'s on the end of
struct entries, in the Osiris and Anubis machines.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] Fix SMP booting
Russell King [Wed, 26 Jul 2006 17:57:40 +0000 (18:57 +0100)]
[ARM] Fix SMP booting

Processor support files now use r6 in their CPU setup code, so
we can't rely on r6 being preserved.  Use r7 instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist
Martin Michlmayr [Mon, 24 Jul 2006 20:30:01 +0000 (21:30 +0100)]
[ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist

Patch from Martin Michlmayr

ARCH_IQ80331 and MACH_IQ80332 can be enabled at the same time but a
header file makes certain IRQ definitions conditional, leading to
the following compilation error when both platforms are enabled:

arch/arm/mach-iop3xx/iq80332-pci.c: In function 'iq80332_map_irq':
arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTA' undeclared (first use in this function)
arch/arm/mach-iop3xx/iq80332-pci.c:54: error: (Each undeclared identifier is reported only once
arch/arm/mach-iop3xx/iq80332-pci.c:54: error: for each function it appears in.)
arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTB' undeclared (first use in this function)
arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTC' undeclared (first use in this function)
arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTD' undeclared (first use in this function)

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3730/1: ep93xx: enable usb ohci driver in the defconfig
Lennert Buytenhek [Sat, 15 Jul 2006 20:08:07 +0000 (21:08 +0100)]
[ARM] 3730/1: ep93xx: enable usb ohci driver in the defconfig

Patch from Lennert Buytenhek

Since the ep93xx ohci bits are merged upstream now, enable ohci in
the ep93xx defconfig.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] Fix cats build
Russell King [Fri, 14 Jul 2006 15:23:33 +0000 (16:23 +0100)]
[ARM] Fix cats build

Fix more fallout from 894673ee6122a3ce1958e1fe096901ba5356a96b.

arch/arm/mach-footbridge/cats-hw.c: In function 'fixup_cats':
arch/arm/mach-footbridge/cats-hw.c:81: error: 'ORIG_VIDEO_LINES' undeclared (first use in this function)
...

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Thu, 13 Jul 2006 23:57:04 +0000 (16:57 -0700)]
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (53 commits)
  [MIPS] sparsemem: fix crash in show_mem
  [MIPS] vr41xx: Update workpad setup function
  [MIPS] vr41xx: Update e55 setup function
  [MIPS] vr41xx: Removed old v2.4 VRC4173 driver
  [MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h
  [MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.
  [MIPS] Remove unused code.
  [MIPS] IP22 Fix brown paper bag in RTC code.
  [MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
  [MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
  [MIPS] Nuke redeclarations of board_time_init.
  [MIPS] Remove redeclarations of setup_irq().
  [MIPS] Nuke redeclarations of board_timer_setup.
  [MIPS] Print out TLB handler assembly for debugging.
  [MIPS] SMTC: Reformat to Linux style.
  [MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.
  [MIPS] IP27: Reformatting.
  [MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.
  [MIPS] IP27: irq_chip startup method returns unsigned int.
  [MIPS] IP27: struct irq_desc member handler was renamed to chip.
  ...

18 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Thu, 13 Jul 2006 23:38:58 +0000 (16:38 -0700)]
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:
  [CIFS] CIFS_DEBUG2 depends on CIFS

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Thu, 13 Jul 2006 23:38:30 +0000 (16:38 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Change SDHCI version error to a warning
  [MMC] Fix incorrect register access

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Thu, 13 Jul 2006 23:38:02 +0000 (16:38 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] 8250: sysrq deadlock fix
  [SERIAL] 8250: add tsi108 serial support
  [SERIAL] IP22: fix serial console hangs
  [SERIAL] dz: Fix compilation error

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 13 Jul 2006 23:37:29 +0000 (16:37 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
  [ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80
  [ARM] 3725/1: sharpsl_pm: warn about wrong temperature
  [ARM] 3723/1: collie charging
  [ARM] 3728/1: Restore missing CPU Hotplug irq helper
  [ARM] 3727/1: fix ucb initialization on collie
  [ARM] Allow Versatile to be built for AB and PB
  [ARM] 3726/1: update {ep93xx,ixp2000,ixp23xx,lpd270,onearm} defconfigs to 2.6.18-rc1
  [ARM] 3721/1: Small cleanup for locomo.c

18 years ago[PATCH] revert slab.c locking change
Ingo Molnar [Thu, 13 Jul 2006 07:12:21 +0000 (09:12 +0200)]
[PATCH] revert slab.c locking change

Chandra Seetharaman reported SLAB crashes caused by the slab.c lock
annotation patch.  There is only one chunk of that patch that has a
material effect on the slab logic - this patch undoes that chunk.

This was confirmed to fix the slab problem by Chandra.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Tested-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[MIPS] sparsemem: fix crash in show_mem
Atsushi Nemoto [Thu, 13 Jul 2006 14:01:50 +0000 (23:01 +0900)]
[MIPS] sparsemem: fix crash in show_mem

With sparsemem, pfn should be checked by pfn_valid() before pfn_to_page().

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Update workpad setup function
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:33 +0000 (17:33 +0900)]
[MIPS] vr41xx: Update workpad setup function

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Update e55 setup function
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:24 +0000 (17:33 +0900)]
[MIPS] vr41xx: Update e55 setup function

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Removed old v2.4 VRC4173 driver
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:14 +0000 (17:33 +0900)]
[MIPS] vr41xx: Removed old v2.4 VRC4173 driver

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:03 +0000 (17:33 +0900)]
[MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.
Ralf Baechle [Mon, 10 Jul 2006 01:37:21 +0000 (02:37 +0100)]
[MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Remove unused code.
Ralf Baechle [Mon, 10 Jul 2006 01:27:21 +0000 (02:27 +0100)]
[MIPS] Remove unused code.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP22 Fix brown paper bag in RTC code.
Julien BLACHE [Sat, 8 Jul 2006 22:21:24 +0000 (00:21 +0200)]
[MIPS] IP22 Fix brown paper bag in RTC code.

This patch fixes a typo in arch/mips/sgi-ip22/ip22-time.c, leading to the
incorrect year being set into the RTC chip.

Signed-off-by: Julien BLACHE <jb@jblache.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
Ralf Baechle [Sun, 9 Jul 2006 21:27:23 +0000 (22:27 +0100)]
[MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().

By the time it's called from time_init interrupts are still disabled.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
Ralf Baechle [Sun, 9 Jul 2006 20:38:56 +0000 (21:38 +0100)]
[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

18 years ago[MIPS] Nuke redeclarations of board_time_init.
Ralf Baechle [Sun, 9 Jul 2006 19:53:19 +0000 (20:53 +0100)]
[MIPS] Nuke redeclarations of board_time_init.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Remove redeclarations of setup_irq().
Ralf Baechle [Sun, 9 Jul 2006 19:49:41 +0000 (20:49 +0100)]
[MIPS] Remove redeclarations of setup_irq().

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Nuke redeclarations of board_timer_setup.
Ralf Baechle [Sun, 9 Jul 2006 19:42:40 +0000 (20:42 +0100)]
[MIPS] Nuke redeclarations of board_timer_setup.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Print out TLB handler assembly for debugging.
Thiemo Seufer [Sun, 9 Jul 2006 00:47:06 +0000 (01:47 +0100)]
[MIPS] Print out TLB handler assembly for debugging.

Small update, using pr_debug and pr_info.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] SMTC: Reformat to Linux style.
Ralf Baechle [Sat, 8 Jul 2006 10:32:58 +0000 (11:32 +0100)]
[MIPS] SMTC: Reformat to Linux style.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.
Ralf Baechle [Sat, 8 Jul 2006 10:25:38 +0000 (11:25 +0100)]
[MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP27: Reformatting.
Ralf Baechle [Fri, 7 Jul 2006 22:57:19 +0000 (23:57 +0100)]
[MIPS] IP27: Reformatting.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.
Ralf Baechle [Fri, 7 Jul 2006 22:56:32 +0000 (23:56 +0100)]
[MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP27: irq_chip startup method returns unsigned int.
Ralf Baechle [Fri, 7 Jul 2006 22:53:05 +0000 (23:53 +0100)]
[MIPS] IP27: irq_chip startup method returns unsigned int.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP27: struct irq_desc member handler was renamed to chip.
Ralf Baechle [Fri, 7 Jul 2006 22:49:30 +0000 (23:49 +0100)]
[MIPS] IP27: struct irq_desc member handler was renamed to chip.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Remove vmlinux.rm200 target from makefile.
Yoichi Yuasa [Fri, 7 Jul 2006 15:51:11 +0000 (00:51 +0900)]
[MIPS] Remove vmlinux.rm200 target from makefile.

Long ago in the dark ages this was used a MIPS a.out binary to be used
with Milo which is obsolete since years.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Replace magic number for P4K bit with symbol.
Yoichi Yuasa [Fri, 7 Jul 2006 15:42:12 +0000 (00:42 +0900)]
[MIPS] vr41xx: Replace magic number for P4K bit with symbol.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Changed workaround to recommended method
Yoichi Yuasa [Fri, 7 Jul 2006 15:42:01 +0000 (00:42 +0900)]
[MIPS] vr41xx: Changed workaround to recommended method

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Oprofile: Fix build failure due to warning and -Werror.
Thiemo Seufer [Fri, 7 Jul 2006 09:38:51 +0000 (10:38 +0100)]
[MIPS] Oprofile: Fix build failure due to warning and -Werror.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] TRACE_IRQFLAGS_SUPPORT support.
Ralf Baechle [Fri, 7 Jul 2006 13:07:18 +0000 (14:07 +0100)]
[MIPS] TRACE_IRQFLAGS_SUPPORT support.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Fix rdhwr_op definition.
Atsushi Nemoto [Fri, 7 Jul 2006 05:26:41 +0000 (14:26 +0900)]
[MIPS] Fix rdhwr_op definition.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Do not count pages in holes with sparsemem
Atsushi Nemoto [Thu, 6 Jul 2006 15:26:02 +0000 (00:26 +0900)]
[MIPS] Do not count pages in holes with sparsemem

With some memory model other than FLATMEM, the single node can
contains some holes so there might be many invalid pages.  For
example, with two 256M memory and one 256M hole, some variables
(num_physpage, totalpages, nr_kernel_pages, nr_all_pages, etc.) will
indicate that there are 768MB on this system.  This is not desired
because, for example, alloc_large_system_hash() allocates too many
entries.

Use free_area_init_node() with counted zholes_size[] instead of
free_area_init().

For num_physpages, use number of ram pages instead of max_low_pfn.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Sparsemem fixes
Atsushi Nemoto [Tue, 4 Jul 2006 16:22:44 +0000 (01:22 +0900)]
[MIPS] Sparsemem fixes

1. MIPS should select SPARSEMEM_STATIC since allocating bootmem in
   memory_present() will corrupt bootmap area.
2. pfn_valid() for SPARSEMEM is defined in linux/mmzone.h

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP32: Fix wreckage caused by recent SA_* constant replacement.
Thiemo Seufer [Wed, 5 Jul 2006 17:43:29 +0000 (18:43 +0100)]
[MIPS] IP32: Fix wreckage caused by recent SA_* constant replacement.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] VR41xx: Set VR41_CONF_BP only for PrId 0x0c80.
Yoichi Yuasa [Tue, 4 Jul 2006 13:59:41 +0000 (22:59 +0900)]
[MIPS] VR41xx: Set VR41_CONF_BP only for PrId 0x0c80.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] MIPS MT: Fix build error.
Yoichi Yuasa [Tue, 4 Jul 2006 13:16:28 +0000 (22:16 +0900)]
[MIPS] MIPS MT: Fix build error.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] BCM1480: Fix fatal typo in the rewritten interrupt handler.
Thiemo Seufer [Wed, 5 Jul 2006 13:32:51 +0000 (14:32 +0100)]
[MIPS] BCM1480: Fix fatal typo in the rewritten interrupt handler.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Sibyte: Improve interrupt latency again for sb1250/bcm1480
Thiemo Seufer [Wed, 5 Jul 2006 13:26:38 +0000 (14:26 +0100)]
[MIPS] Sibyte: Improve interrupt latency again for sb1250/bcm1480

this patch restores the behaviour of the old (assembly-written)
interrupt handler, the handler is left as soon as a single interrupt
cause is handled.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Use the proper technical term for naming some of the cache macros.
Ralf Baechle [Thu, 6 Jul 2006 12:04:01 +0000 (13:04 +0100)]
[MIPS] Use the proper technical term for naming some of the cache  macros.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] IP22: Remove SYS_SUPPORTS_SMP test code.
Ralf Baechle [Thu, 6 Jul 2006 08:47:52 +0000 (09:47 +0100)]
[MIPS] IP22: Remove SYS_SUPPORTS_SMP test code.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Panic on fp exception in kernel mode.
Chris Dearman [Fri, 30 Jun 2006 22:35:28 +0000 (23:35 +0100)]
[MIPS] Panic on fp exception in kernel mode.

There should never be a FP exception in kernel mode.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Malta: Fix build of certain configs.
Ralf Baechle [Mon, 3 Jul 2006 16:02:35 +0000 (17:02 +0100)]
[MIPS] Malta: Fix build of certain configs.

18 years ago[MIPS] au1xxx: Support both YAMON and U-Boot
Domen Puncer [Mon, 3 Jul 2006 06:17:09 +0000 (08:17 +0200)]
[MIPS] au1xxx: Support both YAMON and U-Boot

Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Save 2k text size in cpu-probe
Thiemo Seufer [Mon, 3 Jul 2006 12:30:01 +0000 (13:30 +0100)]
[MIPS] Save 2k text size in cpu-probe

The appended patch drops the inline for decode_configs, this saves about
2k of text size.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Uses MIPS_CONF_AR instead of magic constants.
Thiemo Seufer [Mon, 3 Jul 2006 12:30:01 +0000 (13:30 +0100)]
[MIPS] Uses MIPS_CONF_AR instead of magic constants.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Make SPARSEMEM selectable on QEMU.
Atsushi Nemoto [Sun, 2 Jul 2006 15:09:47 +0000 (00:09 +0900)]
[MIPS] Make SPARSEMEM selectable on QEMU.

This might be helpfull to debug sparsemem on mips.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Make SPARSEMEM selectable on QEMU.
Atsushi Nemoto [Sun, 2 Jul 2006 15:09:47 +0000 (00:09 +0900)]
[MIPS] Make SPARSEMEM selectable on QEMU.

This might be helpfull to debug sparsemem on mips.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Au1000: Remove au1000 code.
Yoichi Yuasa [Sun, 2 Jul 2006 14:17:27 +0000 (23:17 +0900)]
[MIPS] Au1000: Remove au1000 code.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] vr41xx: Removed unused definitions for NEC CMBVR4133.
Yoichi Yuasa [Sun, 2 Jul 2006 14:13:34 +0000 (23:13 +0900)]
[MIPS] vr41xx: Removed unused definitions for NEC CMBVR4133.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Wire up vmsplice(2) and move_pages(2).
Ralf Baechle [Sun, 2 Jul 2006 15:31:14 +0000 (16:31 +0100)]
[MIPS] Wire up vmsplice(2) and move_pages(2).

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Eleminate interrupt migration helper use.
Ralf Baechle [Sun, 2 Jul 2006 13:41:42 +0000 (14:41 +0100)]
[MIPS] Eleminate interrupt migration helper use.

> #define hw_interrupt_type       irq_chip
> typedef struct irq_chip         hw_irq_controller;
> #define no_irq_type             no_irq_chip
> typedef struct irq_desc         irq_desc_t;

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Don't include obsolete <linux/config.h>.
Ralf Baechle [Sat, 1 Jul 2006 21:07:23 +0000 (22:07 +0100)]
[MIPS] Don't include obsolete <linux/config.h>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Default cpu_has_mipsmt to a runtime check
Chris Dearman [Fri, 30 Jun 2006 11:32:37 +0000 (12:32 +0100)]
[MIPS] Default cpu_has_mipsmt to a runtime check

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Use KERN_DEBUG to log the SDBBP messages
Chris Dearman [Fri, 30 Jun 2006 11:32:37 +0000 (12:32 +0100)]
[MIPS] Use KERN_DEBUG to log the SDBBP messages

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Less noise on multithreading exceptions.
Chris Dearman [Fri, 30 Jun 2006 13:19:45 +0000 (14:19 +0100)]
[MIPS] Less noise on multithreading exceptions.

Make the MT handler silent and output the MT exception type at debug
priority.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Update defconfigs to 2.6.18-rc1.
Ralf Baechle [Thu, 13 Jul 2006 20:25:57 +0000 (21:25 +0100)]
[MIPS] Update defconfigs to 2.6.18-rc1.

18 years ago[MIPS] IP27: Don't destroy interrupt routing information on shutdown irq.
Ralf Baechle [Sun, 25 Jun 2006 15:42:21 +0000 (17:42 +0200)]
[MIPS] IP27: Don't destroy interrupt routing information on shutdown irq.

This fixes the "not syncing: Could not identify cpu/level ..." panic
when a PCI irq is requested the second time.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Avoid interprocessor function calls.
Ralf Baechle [Thu, 22 Jun 2006 21:42:32 +0000 (22:42 +0100)]
[MIPS] Avoid interprocessor function calls.

On the 34K where multiple virtual processors are implemented in a single
core and share a single TLB, interprocessor function calls are not needed
to flush a cache, so avoid them.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[PATCH] Fix broken kernel headers preventing ARM build
Russell King [Thu, 13 Jul 2006 19:48:35 +0000 (20:48 +0100)]
[PATCH] Fix broken kernel headers preventing ARM build

As a result of 894673ee6122a3ce1958e1fe096901ba5356a96b, the ARM
architecture is more or less unbuildable - only one defconfig appears
to build, with all others erroring out with:

  CC      arch/arm/kernel/setup.o
In file included from /home/rmk/git/linux-2.6-rmk/arch/arm/kernel/setup.c:22:
/home/rmk/git/linux-2.6-rmk/include/linux/root_dev.h:7: warning: implicit declaration of function `MKDEV'
...

Essentially, root_dev.h uses MKDEV and dev_t, but does not include any
headers which provide either of these definitions.  The reason it worked
previously is that linux/tty.h just happened to include the required
headers for linux/root_dev.h.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] lockdep: annotate mm/slab.c
Arjan van de Ven [Thu, 13 Jul 2006 12:46:03 +0000 (14:46 +0200)]
[PATCH] lockdep: annotate mm/slab.c

mm/slab.c uses nested locking when dealing with 'off-slab'
caches, in that case it allocates the slab header from the
(on-slab) kmalloc caches. Teach the lock validator about
this by putting all on-slab caches into a separate class.

this patch has no effect on non-lockdep kernels.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] lockdep: undo mm/slab.c annotation
Ingo Molnar [Thu, 13 Jul 2006 12:44:38 +0000 (14:44 +0200)]
[PATCH] lockdep: undo mm/slab.c annotation

undo existing mm/slab.c lock-validator annotations, in preparation
of a new, less intrusive annotation patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[MMC] Change SDHCI version error to a warning
Pierre Ossman [Tue, 11 Jul 2006 19:07:10 +0000 (21:07 +0200)]
[MMC] Change SDHCI version error to a warning

O2 Micro's controllers have a larger specification version value and are
therefore denied by the driver. When bypassing this check they seem to work
fine. This patch makes the code a bit more forgiving by changing the error
to a warning.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[MMC] Fix incorrect register access
Pierre Ossman [Tue, 11 Jul 2006 19:06:48 +0000 (21:06 +0200)]
[MMC] Fix incorrect register access

There was a writel() being used on a 16-bit register.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
Adrian Bunk [Tue, 11 Jul 2006 13:37:55 +0000 (15:37 +0200)]
[ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge

Since this assignment was the only place on !alpha where isa_bridge was
touched, it didn't have any effect.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 14:53:11 +0000 (07:53 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 of HEAD

* HEAD:
  [SPARC]: Fix OF register translations under sub-PCI busses.
  [SPARC64]: Refine Sabre wsync logic.
  [SERIAL] sunsu: Handle keyboard and mouse ports directly.
  [SPARC64]: Fix 2 bugs in sabre_irq_build()
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix make headers_install
  [SPARC64]: of_device_register() error checking fix

18 years ago[PATCH] m68knommu: fix result type in get_user() macro
Greg Ungerer [Wed, 12 Jul 2006 23:32:41 +0000 (09:32 +1000)]
[PATCH] m68knommu: fix result type in get_user() macro

Keep the result holder variable the same type as the quantity we are
retreiving in the get_user() macro - don't go through a pointer version
of the user space address type.

Using the address type causes problems if the address type was const
(newer versions of gcc quite rightly error out for that condition).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] i386: system.h: remove extra semicolons and fix order
Chuck Ebbert [Wed, 12 Jul 2006 20:41:15 +0000 (16:41 -0400)]
[PATCH] i386: system.h: remove extra semicolons and fix order

include/asm-i386/system.h has trailing semicolons in some of the
macros that cause legitimate code to fail compilation, so remove
them. Also remove extra blank lines within one group of macros.

And put stts() and clts() back together; they got separated somehow.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80
Koen Kooi [Thu, 13 Jul 2006 12:04:24 +0000 (13:04 +0100)]
[ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80

Patch from Koen Kooi

EABI padding rules necessitate the packed attribute of floatx80,
otherwise nwfpe complains about invalid structure sizes.

Signed-off-by: Koen Kooi <koen@dominion.kabel.utwente.nl>
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[SPARC]: Fix OF register translations under sub-PCI busses.
David S. Miller [Thu, 13 Jul 2006 06:19:31 +0000 (23:19 -0700)]
[SPARC]: Fix OF register translations under sub-PCI busses.

There is an implicit assumption in the code that ranges will translate
to something that can fit in 2 32-bit cells, or a 64-bit value.  For
certain kinds of things below PCI this isn't necessarily true.

Here is what the relevant OF device hierarchy looks like for one of
the serial controllers on an Ultra5:

    Node 0xf005f1e0
        ranges:      00000000.00000000.00000000.000001fe.01000000.00000000.01000000
                     01000000.00000000.00000000.000001fe.02000000.00000000.01000000
                     02000000.00000000.00000000.000001ff.00000000.00000001.00000000
                     03000000.00000000.00000000.000001ff.00000000.00000001.00000000
        device_type:  'pci'
        model:  'SUNW,sabre'

        Node 0xf005f9d4
            device_type:  'pci'
            model:  'SUNW,simba'

           Node 0xf0060d24
                ranges:  00000010.00000000 82010810.00000000.f0000000 01000000
 00000014.00000000 82010814.00000000.f1000000 00800000
                name:  'ebus'

                Node 0xf0062dac
                    reg:  00000014.003083f8.00000008 --> 0x1ff.f13083f8
                    device_type:  'serial'
                    name:  'su'

So the correct translation here is:

1) Match "su" register to second ranges entry of 'ebus', which translates
   into a PCI triplet "82010814.00000000.f1000000" of size 00800000, which
   gives us "82010814.00000000.f13083f8".

2) Pass-through "SUNW,simba" since it lacks ranges property

3) Match "82010814.00000000.f13083f8" to third ranges property of PCI
   controller node 'SUNW,sabre', and we arrive at the final physical
   MMIO address of "0x1fff13083f8".

Due to the 2-cell assumption, we couldn't translate to a PCI 3-cell
value, and we couldn't perform a pass-thru on it either.

It was easiest to just stop splitting the ranges application operation
between two methods, ->map and ->translate, and just let ->map do all
the work.  That way it would work purely on 32-bit cell arrays instead
of having to "return" some value like a u64.

It's still not %100 correct because the out-of-range check is still
done using the 64 least significant bits of the range and address.
But it does work for all the cases I've thrown at it so far.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC64]: Refine Sabre wsync logic.
David S. Miller [Thu, 13 Jul 2006 04:16:07 +0000 (21:16 -0700)]
[SPARC64]: Refine Sabre wsync logic.

It is only needed when there is a PCI-PCI bridge sitting
between the device and the PCI host controller which is
not a Simba APB bridge.

Add logic to handle two special cases:

1) device behind EBUS, which sits on PCI
2) PCI controller interrupts

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SERIAL] sunsu: Handle keyboard and mouse ports directly.
David S. Miller [Thu, 13 Jul 2006 04:04:21 +0000 (21:04 -0700)]
[SERIAL] sunsu: Handle keyboard and mouse ports directly.

The sunsu_ports[] array exists merely to be able to easily
use an integer index to get at the proper serial console
port struct.

We size this only for real ports, not for the keyboard and
mouse, and thus keyboard and mouse port registration would
fail.

Fix this by dynamically allocating the port struct for the
keyboard and mouse, instead of using the sunsu_ports[]
array.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC64]: Fix 2 bugs in sabre_irq_build()
David S. Miller [Wed, 12 Jul 2006 22:59:53 +0000 (15:59 -0700)]
[SPARC64]: Fix 2 bugs in sabre_irq_build()

When installing the IRQ pre-handler, we were not setting up the second
argument correctly.  It should be a pointer to the sabre_irq_data, not
the config space PIO address.

Furthermore, we only need this pre-handler installed if the device
sits behind a PCI bridge that is not Sabre or Simba/APB.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC64]: Update defconfig.
David S. Miller [Wed, 12 Jul 2006 21:01:26 +0000 (14:01 -0700)]
[SPARC64]: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC64]: Fix make headers_install
David Woodhouse [Wed, 12 Jul 2006 20:56:53 +0000 (13:56 -0700)]
[SPARC64]: Fix make headers_install

A minor typo in the include/asm-sparc64/Kbuild file prevents the make
headers_install from building a useful tree of kernel headers for
sparc64.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Tom "spot" Callaway <tcallawa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC64]: of_device_register() error checking fix
Andrew Morton [Mon, 10 Jul 2006 22:28:54 +0000 (15:28 -0700)]
[SPARC64]: of_device_register() error checking fix

device_create_file() can fail.  This causes the sparc64 compile to
fail when my fanatical __must_check patch is applied, due to -Werror.

[ Added necessary identical fix for sparc32. -DaveM]

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 04:19:42 +0000 (21:19 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD

* HEAD:
  [NET]: fix __sk_stream_mem_reclaim
  [Bluetooth] Fix deadlock in the L2CAP layer
  [Bluetooth] Let BT_HIDP depend on INPUT
  [Bluetooth] Avoid NULL pointer dereference with tty->driver
  [Bluetooth] Remaining transitions to use kzalloc()
  [WAN]: converting generic HDLC to use netif_dormant*()
  [IPV4]: Fix error handling for fib_insert_node call
  [NETROM] lockdep: fix false positive
  [ROSE] lockdep: fix false positive
  [AX.25]: Optimize AX.25 socket list lock
  [IPCOMP]: Fix truesize after decompression
  [IPV6]: Use ipv6_addr_src_scope for link address sorting.
  [TCP] tcp_highspeed: Fix AI updates.
  [MAINTAINERS]: Add proper entry for TC classifier
  [NETROM]: Drop lock before calling nr_destroy_socket
  [NETROM]: Fix locking order when establishing a NETROM circuit.
  [AX.25]: Fix locking of ax25 protocol function list.
  [IPV6]: order addresses by scope

18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 04:19:23 +0000 (21:19 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD

* HEAD:
  [PATCH] hwmon: Documentation update for abituguru
  [PATCH] hwmon: Fix for first generation Abit uGuru chips
  [PATCH] hwmon: New maintainer for w83791d
  [PATCH] pca9539: Honor the force parameter
  [PATCH] i2c-algo-bit: Wipe out dead code
  [PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
  [PATCH] i2c: New mailing list
  [PATCH] i2c-ite: Plan for removal
  [PATCH] i2c-powermac: Fix master_xfer return value
  [PATCH] scx200_acb: Fix the block transactions
  [PATCH] scx200_acb: Fix the state machine
  [PATCH] i2c-iop3xx: Avoid addressing self
  [PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core

18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 04:19:06 +0000 (21:19 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD

* HEAD:
  [PATCH] The scheduled unexport of insert_resource
  [PATCH] remove kernel/power/pm.c:pm_unregister_all()
  [PATCH] Driver core: bus.c cleanups
  [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
  [PATCH] Driver core: fix driver-core kernel-doc

18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 04:17:41 +0000 (21:17 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD

* HEAD:
  [PATCH] PCI: PCIE power management quirk
  [PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
  [PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
  [PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()

18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 04:16:52 +0000 (21:16 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 of HEAD

* HEAD: (44 commits)
  [PATCH] USB: move usb-serial.h to include/linux/usb/
  [PATCH] USB: Anydata: Fixes wrong URB callback.
  [PATCH] USB: gadget section fixups
  [PATCH] USB: another unusual device
  [PATCH] USB: Add one VID/PID to ftdi_sio
  [PATCH] USB: unusual_devs entry for Sony DSC-H5
  [PATCH] USB: unusual_devs entry for Nokia E61
  [PATCH] USB: unusual_devs entry for Nokia N91
  [PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver
  [PATCH] USB: Option driver: new product ID
  [PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter
  [PATCH] USB: ipw.c driver fix
  [PATCH] USB: remove devfs information from Kconfig
  [PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c
  [PATCH] USB: ipaq.c timing parameters
  [PATCH] USB: ipaq.c bugfixes
  [PATCH] USB: ehci: fix bogus alteration of a local variable
  [PATCH] USB: add driver for non-composite Sierra Wireless devices
  [PATCH] USB: fix pointer dereference in drivers/usb/misc/usblcd
  [PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci
  ...

18 years agoMerge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD
Linus Torvalds [Thu, 13 Jul 2006 04:16:32 +0000 (21:16 -0700)]
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD

* HEAD:
  [PATCH] w1: remove drivers/w1/w1.h
  [PATCH] w1: fix idle check loop in ds2482
  [PATCH] W1: remove w1 mail list from lm_sensors.

18 years agoRevert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO...
Linus Torvalds [Thu, 13 Jul 2006 04:04:16 +0000 (21:04 -0700)]
Revert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available"

This reverts commit 5040cb8b7e61b7a03e8837920b9eb2c839bb1947.

It breaks previously working ide-cs PIO configurations, causing problems
like

ide2: I/O resource 0xF883200E-0xF883200E not free.
ide2: ports already in use, skipping probe

rather than a working kernel.

Cc: Thomas Kleffel <tk@maintech.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Revert "ACPI: execute Notify() handlers on new thread"
Len Brown [Thu, 13 Jul 2006 02:46:42 +0000 (22:46 -0400)]
[PATCH] Revert "ACPI: execute Notify() handlers on new thread"

This effectively reverts commit b8d35192c55fb055792ff0641408eaaec7c88988
by reverts acpi_os_queue_for_execution() to what it was before that,
except it changes the name to acpi_os_execute() to match ACPICA
20060512.

Signed-off-by: Len Brown <len.brown@intel.com>
[ The thread execution doesn't actually solve the bug it set out to
  solve (see

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

  for more details) because the new events can get caught behind the AML
  semaphore or other serialization.  And when that happens, the notify
  threads keep on piling up until the system dies. ]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[NET]: fix __sk_stream_mem_reclaim
Ian McDonald [Thu, 13 Jul 2006 00:58:53 +0000 (17:58 -0700)]
[NET]: fix __sk_stream_mem_reclaim

__sk_stream_mem_reclaim is only called by sk_stream_mem_reclaim.

As such the check on sk->sk_forward_alloc is not needed and can be
removed.

Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 12 Jul 2006 23:32:16 +0000 (16:32 -0700)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] sky2: optimize receive restart
  [PATCH] sky2: PHY power on delays
  [PATCH] sky2: NAPI suspend/resume of dual port cards
  [PATCH] sky2: sky2_reset section mismatch
  [PATCH] sk98lin: fix truncated collision threshold mask
  [PATCH] skge: fix truncated collision threshold mask
  [PATCH] sky2: fix truncated collision threshold mask
  [PATCH] myri10ge return value fix
  [PATCH] Update smc91x driver with ARM Versatile board info
  [PATCH] ixgb: fix tx unit hang - properly calculate desciptor count
  [PATCH] smsc-ircc2: fix section reference mismatches
  [PATCH] 8139cp.c printk fix
  [PATCH] s2io driver irq fix
  [PATCH] e1000: irq naming update
  [PATCH] forcedeth: watermark fixup
  [PATCH] forcedeth: deferral fixup
  [PATCH] zd1211rw: usb_clear_halt not allowed in IRQ context
  [PATCH] bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise

18 years ago[PATCH] The scheduled unexport of insert_resource
Adrian Bunk [Fri, 30 Jun 2006 09:15:42 +0000 (02:15 -0700)]
[PATCH] The scheduled unexport of insert_resource

Implement the scheduled unexport of insert_resource.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] remove kernel/power/pm.c:pm_unregister_all()
Adrian Bunk [Fri, 30 Jun 2006 09:15:43 +0000 (02:15 -0700)]
[PATCH] remove kernel/power/pm.c:pm_unregister_all()

Remove the deprecated and no longer used pm_unregister_all().

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] Driver core: bus.c cleanups
Adrian Bunk [Mon, 26 Jun 2006 20:26:56 +0000 (22:26 +0200)]
[PATCH] Driver core: bus.c cleanups

This patch contains the following cleanups:
- make the needlessly global bus_subsys static
- #if 0 the unused find_bus()

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
Henrik Kretzschmar [Tue, 4 Jul 2006 22:53:19 +0000 (00:53 +0200)]
[PATCH] Driver core: kernel-doc in drivers/base/core.c corrections

Corrects the kerneldocs for device_create() and device_destroy()
with an eye on coding style, grammar and readability.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] Driver core: fix driver-core kernel-doc
Randy Dunlap [Thu, 22 Jun 2006 22:14:07 +0000 (15:14 -0700)]
[PATCH] Driver core: fix driver-core kernel-doc

Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:574): No description found for parameter 'class'
Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:574): No description found for parameter 'devt'
Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:626): No description found for parameter 'devt'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI: PCIE power management quirk
Kristen Carlson Accardi [Wed, 12 Jul 2006 15:59:00 +0000 (08:59 -0700)]
[PATCH] PCI: PCIE power management quirk

When changing power states from D0->DX and then from DX->D0, some
Intel PCIE chipsets will cause a device reset to occur.  This will
cause problems for any D State other than D3, since any state
information that the driver will expect to be present coming from
a D1 or D2 state will have been cleared.  This patch addes a
flag to the pci_dev structure to indicate that devices should
not use states D1 or D2, and will set that flag for the affected
chipsets.  This patch also modifies pci_set_power_state() so that
when a device driver tries to set the power state on
a device that is downstream from an affected chipset, or on one
of the affected devices it only allows state changes to or
from D0 & D3.  In addition, this patch allows the delay time
between D3->D0 to be changed via a quirk.  These chipsets also
need additional time to change states beyond the normal 10ms.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
Zhang, Yanmin [Wed, 12 Jul 2006 01:41:47 +0000 (09:41 +0800)]
[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h

Add new defines of PCI-Express AER registers and their bits into file
include/linux/pci_regs.h.

Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
Matthew Garrett [Fri, 30 Jun 2006 09:31:25 +0000 (02:31 -0700)]
[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume

Some VIA southbridges contain a flag in the ACPI register space that
indicates whether an abnormal poweroff has occured, presumably with the
intention that it can be cleared on clean shutdown.  Some BIOSes check this
flag at resume time, and will re-POST the system rather than jump back to
the OS if it's set.  Clearing it at boot time appears to be sufficient.
I'm not sure if drivers/pci/quirks.c is the right place to do it, but I'm
not sure where would be cleaner.

[akpm@osdl.org: cleanups, build fix]
Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Greg KH <greg@kroah.com>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Yu, Luming" <luming.yu@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
Adrian Bunk [Wed, 28 Jun 2006 16:54:33 +0000 (18:54 +0200)]
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()

This patch adds a proper prototype for pcibios_sort() in
arch/i386/pci/pci.h.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>