15 years agopowerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S
Paul Mackerras [Mon, 10 Oct 2005 12:36:14 +0000]
powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S

The system call table has been consolidated into systbl.S.  We have
separate 32-bit and 64-bit versions of entry.S and misc.S since the
code is mostly sufficiently different to be not worth merging.
There are some common bits that will be extracted in future.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: make process.c suitable for both 32-bit and 64-bit
Paul Mackerras [Mon, 10 Oct 2005 12:29:05 +0000]
powerpc: make process.c suitable for both 32-bit and 64-bit

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Use arch/powerpc/mm and arch/powerpc/lib for 64-bit
Paul Mackerras [Mon, 10 Oct 2005 12:25:26 +0000]
powerpc: Use arch/powerpc/mm and arch/powerpc/lib for 64-bit

This also puts a copy of indirect_pci.c in arch/powerpc/sysdev
so that we don't need to build in arch/ppc/syslib.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Use reg.h instead of processor.h when we just want reg names
Paul Mackerras [Mon, 10 Oct 2005 12:20:10 +0000]
powerpc: Use reg.h instead of processor.h when we just want reg names

Now that the register names and bit definitions are all in reg.h,
use that instead of processor.h in assembly code in a few places.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merge Kconfig.debug
Paul Mackerras [Mon, 10 Oct 2005 12:15:52 +0000]
powerpc: Merge Kconfig.debug

This merges in the ppc64 bits into arch/powerpc/Kconfig.debug

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: rename powermac files to remove pmac_ prefix
Paul Mackerras [Mon, 10 Oct 2005 12:13:53 +0000]
powerpc: rename powermac files to remove pmac_ prefix

Since the files are now in arch/powerpc/platforms/powermac, the
pmac_ prefix that they had is redundant.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoppc64: Use SPRN_ prefix for special purpose register names
Paul Mackerras [Mon, 10 Oct 2005 12:07:35 +0000]
ppc64: Use SPRN_ prefix for special purpose register names

Now that we are using the merged reg.h we have to use the SPRN_xxx
names rather than the xxx names.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: move pSeries files to arch/powerpc/platforms/pseries
Paul Mackerras [Mon, 10 Oct 2005 12:03:41 +0000]
powerpc: move pSeries files to arch/powerpc/platforms/pseries

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merge arch/ppc64/mm to arch/powerpc/mm
Paul Mackerras [Mon, 10 Oct 2005 11:58:35 +0000]
powerpc: Merge arch/ppc64/mm to arch/powerpc/mm

This moves the remaining files in arch/ppc64/mm to arch/powerpc/mm,
and arranges that we use them when compiling with ARCH=ppc64.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Rename files to have consistent _32/_64 suffixes
Paul Mackerras [Mon, 10 Oct 2005 11:52:43 +0000]
powerpc: Rename files to have consistent _32/_64 suffixes

This doesn't change any code, just renames things so we consistently
have foo_32.c and foo_64.c where we have separate 32- and 64-bit
versions.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoppc64: Use the merged lmb routines
Paul Mackerras [Mon, 10 Oct 2005 10:49:07 +0000]
ppc64: Use the merged lmb routines

The only real change here is that lmb_enforce_memory_limit now takes
the memory_limit as a parameter instead of as a global variable.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merged processor.h.
Paul Mackerras [Mon, 10 Oct 2005 04:19:43 +0000]
powerpc: Merged processor.h.

This adds register definitions from the ppc64 processor.h to reg.h,
and makes a single merged processor.h.  I moved __is_processor from
the ppc64 system.h to the merged reg.h along with the PVR register
constants.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Make some #includes explicit.
Paul Mackerras [Mon, 10 Oct 2005 04:14:55 +0000]
powerpc: Make some #includes explicit.

In preparation for merging processor.h, this adds some explicit
but won't be after the merge.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Use SPRN_xxx rather than xxx for SPR numbers
Paul Mackerras [Mon, 10 Oct 2005 04:01:07 +0000]
powerpc: Use SPRN_xxx rather than xxx for SPR numbers

This changes symbols like HID0, SPRG3, SRR0, SRR1 etc. that refer to
special purpose registers to SPRN_HID0, SPRN_SPRG3, etc.  Using the
SPRN_ symbols clutters the namespace less, and the forthcoming merge
of asm/processor.h and asm/reg.h is going to remove the non-SPRN_
versions.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Fix idle.c compile warning
Paul Mackerras [Thu, 6 Oct 2005 03:29:24 +0000]
powerpc: Fix idle.c compile warning

This fixes a compile warning when using arch/ppc/kernel/idle.c
in a merged (ARCH=powerpc) kernel.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Define a _sdata symbol
Paul Mackerras [Thu, 6 Oct 2005 03:28:31 +0000]
powerpc: Define a _sdata symbol

This is needed by arch/powerpc/mm/mem.c now.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merge traps.c a bit more
Paul Mackerras [Thu, 6 Oct 2005 03:27:05 +0000]
powerpc: Merge traps.c a bit more

This reduces the differences between ppc32 and ppc64 in
arch/powerpc/kernel/traps.c a bit further.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Use the merged of_device.c with ARCH=powerpc
Paul Mackerras [Thu, 6 Oct 2005 03:24:50 +0000]
powerpc: Use the merged of_device.c with ARCH=powerpc

Also compile btext.c with -fPIC; this was missed before.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merge of_device.c and of_device.h
Paul Mackerras [Thu, 6 Oct 2005 03:22:17 +0000]
powerpc: Merge of_device.c and of_device.h

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Remove 64-bit cpu support from ppc32.
Paul Mackerras [Thu, 6 Oct 2005 02:49:05 +0000]
powerpc: Remove 64-bit cpu support from ppc32.

These days there is no good reason to run a ppc32 kernel on a 64-bit
cpu, rather than a ppc64 kernel, so remove the config option and a
bunch of code (and ifdefs) from head.S.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merge lmb.c and make MM initialization use it.
Paul Mackerras [Thu, 6 Oct 2005 02:23:33 +0000]
powerpc: Merge lmb.c and make MM initialization use it.

This also creates merged versions of do_init_bootmem, paging_init
and mem_init and moves them to arch/powerpc/mm/mem.c.  It gets rid
of the mem_pieces stuff.

I made memory_limit a parameter to lmb_enforce_memory_limit rather
than a global referenced by that function.  This will require some
small changes to ppc64 if we want to continue building ARCH=ppc64
using the merged lmb.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Merge in the ppc64 version of the prom code.
Paul Mackerras [Thu, 6 Oct 2005 02:06:20 +0000]
powerpc: Merge in the ppc64 version of the prom code.

This brings in the ppc64 version of prom_init.c, prom.c and btext.c
and makes them work for ppc32.  This also brings in the new calling
convention, where the first entry to the kernel (with r5 != 0) goes
to the prom_init code, which then restarts from the beginning (with
r5 == 0) after it has done its stuff.

For now this also brings in the ppc32 version of setup.c.  It also
merges lmb.h.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Define 32/64 bit asm macros and use them in fpu.S
Paul Mackerras [Thu, 6 Oct 2005 00:59:19 +0000]
powerpc: Define 32/64 bit asm macros and use them in fpu.S

These macros help in writing assembly code that works for both ppc32
and ppc64.  With this we now have a common fpu.S.  This takes out
load_up_fpu from head_64.S.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoppc32: remove obsolete klock_info definition
Paul Mackerras [Tue, 4 Oct 2005 04:30:07 +0000]
ppc32: remove obsolete klock_info definition

klock_info isn't used or referenced anywhere else in the kernel.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoppc32: export a few more things where they are defined
Paul Mackerras [Tue, 4 Oct 2005 04:28:29 +0000]
ppc32: export a few more things where they are defined

... and remove the exports from ppc_ksyms.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoMerge rsync://ozlabs.org/sfr-git/for-paulus/
Paul Mackerras [Sun, 2 Oct 2005 01:12:43 +0000]
Merge rsync://ozlabs.org/sfr-git/for-paulus/

15 years agopowerpc: make iSeries boot
Stephen Rothwell [Fri, 30 Sep 2005 07:24:15 +0000]
powerpc: make iSeries boot

Now that we use the device tree, it helps to build it in.
It helps to links the kernel at the correct address.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: make iSeries build
Stephen Rothwell [Fri, 30 Sep 2005 06:16:52 +0000]
powerpc: make iSeries build

Merge vmlinux.lds.S.
Also remove arch/powerpc/kernel/vmlinux.lds which is a
generated file.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agoppc64: simplify the build a little
Stephen Rothwell [Fri, 30 Sep 2005 03:51:25 +0000]
ppc64: simplify the build a little

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: merge idle_power4.S and trapc.s
Stephen Rothwell [Sat, 1 Oct 2005 08:43:42 +0000]
powerpc: merge idle_power4.S and trapc.s

Use idle_power4.S from ppc64 as we are not going to support
32 bit power4 in the merged tree.

Merge ppc64 traps.c into powerpc traps.c:
use ppc64 versions of exception routine names
(as they don't have StudlyCaps)
make all the versions if die() have the same
prototype

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Get merged kernel to compile and run on 32-bit SMP powermac.
Paul Mackerras [Sat, 1 Oct 2005 03:49:08 +0000]
powerpc: Get merged kernel to compile and run on 32-bit SMP powermac.

This updates the powermac SMP code to use the mpic driver instead of
the openpic driver and fixes the SMP-dependent context switch code.
We had a subtle bug where we were using interrupt numbers 256-259 for
IPIs, but ppc32 had NR_IRQS = 256.  Moved the IPIs down to use interrupt
numbers 252-255 instead.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Move lparmap.c to powerpc/platforms
Stephen Rothwell [Wed, 28 Sep 2005 15:46:29 +0000]
powerpc: Move lparmap.c to powerpc/platforms

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: more cleanup of powerpc/kernel
Stephen Rothwell [Thu, 29 Sep 2005 01:50:22 +0000]
powerpc: more cleanup of powerpc/kernel

Update head_64.S from arch/ppc64
Remove arc/ppc/kernel/fpu.S

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: remove old vector.S files
Stephen Rothwell [Wed, 28 Sep 2005 14:59:39 +0000]
powerpc: remove old vector.S files

Update old kernel/Makefiles to cope

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: merge asm-offsets.c
Stephen Rothwell [Wed, 28 Sep 2005 14:35:31 +0000]
powerpc: merge asm-offsets.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agoppc64 iseries: move some iSeries include files
Stephen Rothwell [Wed, 28 Sep 2005 13:37:01 +0000]
ppc64 iseries: move some iSeries include files

These files are only referenced from within
arch/powerpc/platforms/iseries, so move them there.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agoMerge by hand from Linus' tree.
Paul Mackerras [Thu, 29 Sep 2005 03:13:36 +0000]
Merge by hand from Linus' tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[PATCH] Keys: Add possessor permissions to keys [try #3]
David Howells [Wed, 28 Sep 2005 16:03:15 +0000]
[PATCH] Keys: Add possessor permissions to keys [try #3]

The attached patch adds extra permission grants to keys for the possessor of a
key in addition to the owner, group and other permissions bits. This makes
SUID binaries easier to support without going as far as labelling keys and key
targets using the LSM facilities.

This patch adds a second "pointer type" to key structures (struct key_ref *)
that can have the bottom bit of the address set to indicate the possession of
a key. This is propagated through searches from the keyring to the discovered
key. It has been made a separate type so that the compiler can spot attempts
to dereference a potentially incorrect pointer.

The "possession" attribute can't be attached to a key structure directly as
it's not an intrinsic property of a key.

Pointers to keys have been replaced with struct key_ref *'s wherever
possession information needs to be passed through.

This does assume that the bottom bit of the pointer will always be zero on
return from kmem_cache_alloc().

The key reference type has been made into a typedef so that at least it can be
located in the sources, even though it's basically a pointer to an undefined
type. I've also renamed the accessor functions to be more useful, and all
reference variables should now end in "_ref".

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] cpuset read past eof memory leak fix
Paul Jackson [Wed, 28 Sep 2005 13:42:24 +0000]
[PATCH] cpuset read past eof memory leak fix

Don't leak a page of memory if user reads a cpuset file past eof.

Signed-off-by: KUROSAWA Takahiro <kurosawa@valinux.co.jp>
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years agoMerge branch 'for-linus' from master.kernel.org:/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Wed, 28 Sep 2005 14:47:55 +0000]
Merge branch 'for-linus' from /linux/kernel/git/roland/infiniband

15 years ago[PATCH] kmalloc_node IRQ safety fix
Alok N Kataria [Wed, 28 Sep 2005 04:45:46 +0000]
[PATCH] kmalloc_node IRQ safety fix

In kmalloc_node we are checking if the allocation is for the same node when
interrupts are "on".  This may lead to an allocation on another node than
intended.

This patch just shifts the check for the current node in __cache_alloc_node
when interrupts are disabled.

Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] ppc64: More hugepage fixes
Benjamin Herrenschmidt [Wed, 28 Sep 2005 04:45:45 +0000]
[PATCH] ppc64: More hugepage fixes

My previous patch fixing invalidation of huge PTEs wasn't good enough, we
still had an issue if a PTE invalidation batch contained both small and
large pages.  This patch fixes this by making sure the batch is flushed if
the page size fed to it changes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] device-mapper: Fix queue_if_no_path initialisation
Alasdair G Kergon [Wed, 28 Sep 2005 04:45:45 +0000]
[PATCH] device-mapper: Fix queue_if_no_path initialisation

When creating a multipath device, if the queue_if_no_path parameter is
specified it gets ignored.

While the queue_if_no_path variable is correctly set to 1, the
saved_queue_if_no_path gets set to 0.  When the device is subsequently made
live (resumed), the saved value (0) always overwrites the live value (1) so
the option *always* gets turned off.

The fix adds a parameter to the queue_if_no_path() function to indicate
whether the previous value should be preserved or not - if not, as when the
device is being set up, the saved value is set to the new value (1).

Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] device-mapper: Trigger an event when a table is deleted
goggin, edward [Wed, 28 Sep 2005 04:45:44 +0000]
[PATCH] device-mapper: Trigger an event when a table is deleted

If anything is waiting on a device's table when the device is removed, we
must first wake it up so it will release its reference.  Otherwise the
table's reference count will not drop to zero and the table will not get
removed.

Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] swsusp: avoid problems if there are too many pages to save
Rafael J. Wysocki [Wed, 28 Sep 2005 04:45:43 +0000]
[PATCH] swsusp: avoid problems if there are too many pages to save

The following patch makes swsusp avoid problems during resume if there are
too many pages to save on suspend.  It adds a constant that allows us to
verify if we are going to save too many pages and implements the check
(this is done as early as we can tell that the check will trigger, which is
in swsusp_alloc()).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] orinoco: Fix flood of kernel log with stupid WE warnings
Benjamin Herrenschmidt [Wed, 28 Sep 2005 04:45:41 +0000]
[PATCH] orinoco: Fix flood of kernel log with stupid WE warnings

Latest wireless extensions moved a field from netdev -> wireless_handlers.
The WE core will now printk a warning on every call to get_wireless_stats()
on a driver that still uses the old field.  This patch fixes orinoco.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] ppc64: Add missing barrier() in kexec code
Anton Blanchard [Wed, 28 Sep 2005 04:45:38 +0000]
[PATCH] ppc64: Add missing barrier() in kexec code

Mikey and I were testing kexec and hit a lockup.  It turns out gcc 4.0
optimises the kexec_prepare_cpus loop so we avoid reloading paca.hw_cpu_id.
 A gcc barrier() fixes the problem.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] cpuset maintainers
Paul Jackson [Wed, 28 Sep 2005 04:45:37 +0000]
[PATCH] cpuset maintainers

Specify the cpuset maintainers.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Simon Derr <simon.derr@bull.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] x86-64: Fix bad assumption that dualcore cpus have synced TSCs
john stultz [Wed, 28 Sep 2005 04:45:36 +0000]
[PATCH] x86-64: Fix bad assumption that dualcore cpus have synced TSCs

This should resolve the issue seen in bugme bug #5105, where it is assumed
that dualcore x86_64 systems have synced TSCs.  This is not the case, and
alternate timesources should be used instead.

For more details, see:
http://bugzilla.kernel.org/show_bug.cgi?id=5105

Andi's earlier concerns that the TSCs should be synced on dualcore systems
have been resolved by confirmation from AMD folks that they can be
unsynced.

Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Add IPMI poweroff control to sysfs
Corey Minyard [Wed, 28 Sep 2005 04:45:35 +0000]
[PATCH] Add IPMI poweroff control to sysfs

Put the IPMI poweroff_powercycle parameter into sysfs.  This field is
dynamically settable and is valuable to have in sysfs.

Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] ppc: fix stupid thinko in oprofile fix
Benjamin Herrenschmidt [Wed, 28 Sep 2005 04:45:35 +0000]
[PATCH] ppc: fix stupid thinko in oprofile fix

I did something stupid in my oprofile fix, here's the obvious fix:

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Ignore trailing whitespace on kernel parameters correctly
Rusty Russell [Wed, 28 Sep 2005 04:45:34 +0000]
[PATCH] Ignore trailing whitespace on kernel parameters correctly

Dave Jones says:

... if the modprobe.conf has trailing whitespace, modules fail to load
with the following helpful message..

snd_intel8x0: Unknown parameter `'

Previous version truncated last argument.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] epoll: handle timeout overflow
Davide Libenzi [Wed, 28 Sep 2005 04:45:33 +0000]
[PATCH] epoll: handle timeout overflow

Handle the timeout upper boundary for epoll.

Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] swsusp: prevent possible memory leak
Rafael J. Wysocki [Wed, 28 Sep 2005 04:45:32 +0000]
[PATCH] swsusp: prevent possible memory leak

Prevent swsusp from leaking some memory in case of an error in
read_pagedir().  It also prevents the BUG_ON() from triggering if there's
an error while reading swap.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] swsusp: remove wrong code from data_free
Rafael J. Wysocki [Wed, 28 Sep 2005 04:45:31 +0000]
[PATCH] swsusp: remove wrong code from data_free

The following patch removes some wrong code from the data_free() function
in swsusp.

This function could only be called if there's an error while writing the
suspend image to swap, so it is not triggered easily.  However, if
triggered, it would probably corrupt some memory.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] pktcdvd: MAINTAINERS record
Peter Osterlund [Wed, 28 Sep 2005 04:45:30 +0000]
[PATCH] pktcdvd: MAINTAINERS record

Add a MAINTAINERS entry for the pktcdvd driver.

Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] dvb: fix NULL pointer dereference when loading the budget-av module
Jon Burgess [Wed, 28 Sep 2005 04:45:26 +0000]
[PATCH] dvb: fix NULL pointer dereference when loading the budget-av module

Ralph Metzler wrote:
> AFAIR, there is a bug in tda10021.c in tda10021_readreg() which
> references state->frontend.dvb->num
> This is fatal if the frontend is not at the probed address and thus
> not yet registered (no dvb entry set yet -> NULL pointer ...).

The attached patch should get rid of the oops.

Signed-off-by: Jon Burgess <jburgess@uklinux.net>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] v9fs: fix races in fid allocation
Latchesar Ionkov [Wed, 28 Sep 2005 04:45:24 +0000]
[PATCH] v9fs: fix races in fid allocation

Fid management cleanup.  The patch attempts to fix the races in dentry's
fid management.

Dentries don't keep the opened fids anymore, they are moved to the file
structs.  Ideally there should be no more than one fid with fidcreate equal
to zero in the dentry's list of fids.

v9fs_fid_create initializes the important fields (fid, fidcreated) before
v9fs_fid is added to the list.  v9fs_fid_lookup returns only fids that are
not created by v9fs_create.  v9fs_fid_get_created returns the fid created
by the same process by v9fs_create (if any) and removes it from dentry's
list

Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Fix ext3_new_inode() failure paths
Chris Sykes [Wed, 28 Sep 2005 04:45:23 +0000]
[PATCH] Fix ext3_new_inode() failure paths

Fix failure paths in ext3_new_inode() and clean up duplicated code: -
DQUOT_DROP() was not being called if ext3_init_security() failed.

Signed-off-by: Chris Sykes <chris@sigsegv.plus.com>
Cc: Stephen Smalley <sds@epoch.ncsc.mil>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Fix ext2_new_inode() failure paths
Chris Sykes [Wed, 28 Sep 2005 04:45:22 +0000]
[PATCH] Fix ext2_new_inode() failure paths

Fix failure paths in ext2_new_inode() and clean up duplicated code: -
DQUOT_DROP() was not being called if ext2_init_security() failed.

Signed-off-by: Chris Sykes <chris@sigsegv.plus.com>
Cc: Stephen Smalley <sds@epoch.ncsc.mil>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] fuse: check reserved node ID values
Miklos Szeredi [Wed, 28 Sep 2005 04:45:21 +0000]
[PATCH] fuse: check reserved node ID values

This patch checks reserved node ID values returned by lookup and creation
operations.  In case one of the reserved values is sent, return -EIO.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] fuse: add required version info
Miklos Szeredi [Wed, 28 Sep 2005 04:45:20 +0000]
[PATCH] fuse: add required version info

Add information about required version of the userspace library/utilities
to Documentation/Changes.  Also add pointer to this and to FUSE
documentation from Kconfig.

Thanks to Anton Altaparmakov for the reminder.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] mm: move_pte to remap ZERO_PAGE
Nick Piggin [Wed, 28 Sep 2005 04:45:18 +0000]
[PATCH] mm: move_pte to remap ZERO_PAGE

Move the ZERO_PAGE remapping complexity to the move_pte macro in
asm-generic, have it conditionally depend on
__HAVE_ARCH_MULTIPLE_ZERO_PAGE, which gets defined for MIPS.

For architectures without __HAVE_ARCH_MULTIPLE_ZERO_PAGE, move_pte becomes
a noop.

From: Hugh Dickins <hugh@veritas.com>

Fix nasty little bug we've missed in Nick's mremap move ZERO_PAGE patch.
The "pte" at that point may be a swap entry or a pte_file entry: we must
check pte_present before perhaps corrupting such an entry.

Patch below against 2.6.14-rc2-mm1, but the same bug is in 2.6.14-rc2's
mm/mremap.c, and more dangerous there since it's affecting all arches: I
think the safest course is to send Nick's patch and Yoichi's build fix and
this fix (build tested) on to Linus - so only MIPS can be affected.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years agoMerge Stephen Rothwell's patches
Paul Mackerras [Wed, 28 Sep 2005 11:11:41 +0000]
Merge Stephen Rothwell's patches

15 years agoDon't call a NULL ack function in the generic IRQ code.
Paul Mackerras [Wed, 28 Sep 2005 10:29:44 +0000]
Don't call a NULL ack function in the generic IRQ code.

Some IRQ controllers don't need an ack function (e.g. OpenPIC on
PPC platforms) and for them we'd rather not have the overhead
of doing an indirect call to a function that does nothing.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Fixes to get the merged kernel to boot on powermac.
Paul Mackerras [Wed, 28 Sep 2005 10:28:14 +0000]
powerpc: Fixes to get the merged kernel to boot on powermac.

This merges ppc_ksyms.c, puts back the actual do_execve call in
sys_execve, makes init_MMU call find_end_of_memory rather than
ppc_md.find_end_of_memory (every platform has a device tree
with a /memory node now, right?) and fixes some problems with the
mpic initialization on newworld powermacs.

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: Fix building in the old arch's boot directory for now
Paul Mackerras [Wed, 28 Sep 2005 05:53:36 +0000]
powerpc: Fix building in the old arch's boot directory for now

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[PATCH] ppc32: make cur_cpu_spec a single pointer instead of an array
Kumar Gala [Tue, 27 Sep 2005 20:13:12 +0000]
[PATCH] ppc32: make cur_cpu_spec a single pointer instead of an array

Changed ppc32 so that cur_cpu_spec is just a single pointer for all CPUs.
Additionally, made call_setup_cpu check to see if the cpu_setup pointer
is NULL or not before calling the function.  This lets remove the dummy
cpu_setup calls that just return.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[PATCH] powerpc: merged asm/cputable.h
Kumar Gala [Fri, 23 Sep 2005 19:08:58 +0000]
[PATCH] powerpc: merged asm/cputable.h

Merged cputable.h between ppc32 and ppc64.  In doing this removed support
for the BEGIN_FTR_SECTION/END_FTR_SECTION macros in C code since they
dont compile correctly.  C code should use cpu_has_feature().  This is
based on Arnd Bergmann's initial patch.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[PATCH] powerpc: merge byteorder.h
Becky Bruce [Tue, 27 Sep 2005 19:28:56 +0000]
[PATCH] powerpc: merge byteorder.h

powerpc: Merge byteorder.h

Essentially adopts the 64-bit version of this file.  The 32-bit version had
been using unsigned ints for arguments/return values that were actually
only 16 bits - the new file uses __u16 for these items as in the 64-bit
version of the header.  The order of some of the asm constraints
in the 64-bit version was slightly different than the 32-bit version,
but they produce identical code.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoppc64 iSeries: use device_node instead of iSeries_Device_node
Stephen Rothwell [Wed, 28 Sep 2005 04:40:40 +0000]
ppc64 iSeries: use device_node instead of iSeries_Device_node

There needs to be more cleanup after this.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: move more iSeries code
Stephen Rothwell [Wed, 28 Sep 2005 03:28:01 +0000]
powerpc: move more iSeries code

Move the iSeries specific parts of misc.S and ppc_ksyms.c
into powerpc/platforms/iseries.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Make powerpc pmac 32 bit build again
Stephen Rothwell [Tue, 27 Sep 2005 23:40:24 +0000]
powerpc: Make powerpc pmac 32 bit build again

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years ago[IB] mthca: fix hw_ver value returned from mthca_query_device
Jack Morgenstein [Tue, 27 Sep 2005 20:54:44 +0000]
[IB] mthca: fix hw_ver value returned from mthca_query_device

The IB spec defines the field to be 32 bits, not 16 bits.

Signed-off-by: Jack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 27 Sep 2005 20:33:25 +0000]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 27 Sep 2005 20:32:33 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

15 years ago[PATCH] Make POSIX message queue sys_mq_open() honor umask
Krzysztof Benedyczak [Tue, 27 Sep 2005 20:21:36 +0000]
[PATCH] Make POSIX message queue sys_mq_open() honor umask

We ignored umask when creating new queues via mq_open (when creating
with open() on mqueue fs it is ok of course).  According to the
specification this a bug.  This trivial patch fixes this.

Signed-off-by: Krzysztof Benedyczak <golbi@mat.uni.torun.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[TG3]: Update driver version and release date.
David S. Miller [Tue, 27 Sep 2005 19:13:38 +0000]
[TG3]: Update driver version and release date.

Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[TG3]: misc. fixes
Michael Chan [Tue, 27 Sep 2005 19:13:10 +0000]
[TG3]: misc. fixes

Fix interrupt test handler by adding check for IRQ assertion in
PCI_STATE register in addition to the status block updated bit.

Add test for valid ethernet address in tg3_set_mac_addr().

Add tg3_bus_string() to setup the PCI bus speed/width string for all
PCI/PCIX/PCI Express devices. This is used to print the bus type
during init_one().

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[TG3]: 5780 PHY fixes
Michael Chan [Tue, 27 Sep 2005 19:12:42 +0000]
[TG3]: 5780 PHY fixes

Fix 5780 PHY related problems:

1. MAC_RX_MODE reset must be done before setting up the MAC_MODE
   register on 5705_PLUS chips or the chip will stop receiving after
   a while. The MAC_RX_MODE reset is needed to prevent intermittently
   losing the first receive packet on serdes chips.

2. Skip MAC loopback test on 5780 because of hardware errata. Normal
   traffic including PHY loopback is not affected by the errata.

3. PHY loopback fails intermittently on 5708S and this is fixed by
   putting the PHY in loopback mode first before programming the MAC
   mode register. A MAC_RX_MODE reset is also added.

4. Return -EINVAL in tg3_nway_reset() if device is in TBI mode. Allow
   nway_reset if 5780S is in parallel detect mode.

5. Add missing PHY IDs in KNOWN_PHY_ID() macro.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[NEIGH]: Add debugging check when adding timers.
David S. Miller [Tue, 27 Sep 2005 19:07:44 +0000]
[NEIGH]: Add debugging check when adding timers.

If we double-add a neighbour entry timer, which should be
impossible but has been reported, dump the current state of
the entry so that we can debug this.

Signed-off-by: David S. Miller <davem@davemloft.net>

15 years agopowerpc: Move viopath.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 17:12:35 +0000]
powerpc: Move viopath.c to powerpc/platforms/iseries

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_smp.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 17:07:14 +0000]
powerpc: Move iSeries_smp.c to powerpc/platforms/iseries

And rename it to smp.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_vio.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 17:03:00 +0000]
powerpc: Move iSeries_vio.c to powerpc/platforms/iseries

And rename it to vio.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_VpdInfo.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 16:59:19 +0000]
powerpc: Move iSeries_VpdInfo.c to powerpc/platforms/iseries

And rename it to vpdinfo.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_irq.c to powerpc/platorms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 16:54:39 +0000]
powerpc: Move iSeries_irq.c to powerpc/platorms/iseries

And rename it to irq.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_pci.c to powerpc/platform/iseries
Stephen Rothwell [Tue, 27 Sep 2005 16:50:25 +0000]
powerpc: Move iSeries_pci.c to powerpc/platform/iseries

and rename it to pci.c.  This also required moving
arch/ppc64/kernel/pci.h into include/asm-powerpc (called
ppc-pci.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_iommu.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 16:32:16 +0000]
powerpc: Move iSeries_iommu.c to powerpc/platforms/iseries

And rename it to iommu.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move iSeries_htab.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 16:28:45 +0000]
powerpc: Move iSeries_htab.c to powerpc/platforms/iseries

And rename it to htab.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: move iSeries_proc.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 16:24:05 +0000]
powerpc: move iSeries_proc.c to powerpc/platforms/iseries

And renamed it to proc.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Merge HvLpEvent.c into lpevents.c
Stephen Rothwell [Tue, 27 Sep 2005 16:18:47 +0000]
powerpc: Merge HvLpEvent.c into lpevents.c

These two files were intimately connected, so just merge them.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: move hvCall.s to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 14:17:40 +0000]
powerpc: move hvCall.s to powerpc/platforms/iseries

Rename it to hvcall.S and (so I can do that) rename hvcall.c
to hvlog.c - a more appropriate name.

Do some white space cleanups.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: move ItLpQueue.c to powerpc/platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 14:03:46 +0000]
powerpc: move ItLpQueue.c to powerpc/platforms/iseries

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: move iSeries_setup.[ch] and mf.c into platforms/iseries
Stephen Rothwell [Tue, 27 Sep 2005 08:44:42 +0000]
powerpc: move iSeries_setup.[ch] and mf.c into platforms/iseries

iSeries_setup.c becomes setup.c
iSeries_setup.h becomes setup.h
mf.c retains its name

Also moved iSeries_[gs]et_rtc_time and iSeries_get_boot_time into
mf.c since they are just small wrappers around mf_ functions.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move LparData.c to powerpc platforms
Stephen Rothwell [Fri, 23 Sep 2005 03:42:26 +0000]
powerpc: Move LparData.c to powerpc platforms

Also rename it to lpardata.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Move HvLpConfig.c to powerpc arch
Stephen Rothwell [Fri, 23 Sep 2005 03:23:58 +0000]
powerpc: Move HvLpConfig.c to powerpc arch

Also rename it to hvlpconfig.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years agopowerpc: Create arch/powerpc/platforms/iseries
Stephen Rothwell [Fri, 23 Sep 2005 03:15:51 +0000]
powerpc: Create arch/powerpc/platforms/iseries

I also move arch/ppc64/kernel/HvCall.c to
arch/powerpc/platforms/iseries/hvcall.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

15 years ago[PATCH] ppc64 g5: merge tree build fix
Stephen Rothwell [Tue, 27 Sep 2005 04:09:39 +0000]
[PATCH] ppc64 g5: merge tree build fix

We removed __pmacdata in the merge.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoppc64: Fix typo in iommu cleanups that broke pmac build.
Paul Mackerras [Tue, 27 Sep 2005 04:24:18 +0000]
ppc64: Fix typo in iommu cleanups that broke pmac build.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[IB] mthca: Round up number of slots in HCA context memory table
Michael S. Tsirkin [Tue, 27 Sep 2005 04:12:26 +0000]
[IB] mthca: Round up number of slots in HCA context memory table

When allocating a table for mem-free HCA context, don't assume that
obj_size * nobj is an even multiple of MTHCA_TABLE_CHUNK_SIZE.  In
particular, make sure we allocate at least one slot even if the table
is smaller than MTHCA_TABLE_CHUNK_SIZE.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>