__wrap_free is now careful about freeing to the same allocator that allocated
the buffer.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tidied up some whitespace in arch/um/Makefile.  Added -DUM_FASTCALL to
Makefile-i386.  make clean descends into util in order to get rid of the
binaries there.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/um/uml.lds.S has already been moved to arch/um/kernel. dyn.lds.S has just
been forgotten, so fix this.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Unconditionally enabling interrupts is upsetting the ACPI time resume code.
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix various gcc-4.0 compilation errors.

Signed-off-by: Grzegorz Jaskiewicz <gj at pointblue.com.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The following patch to the generic direct IO code fixes a problem we've
come across that affects the way XFS interacts with it.  Between 2.6.5 and
2.6.6 several changes to direct IO were made, in particular the
fallback-to-buffered path was introduced in that timeframe.

Those changes split the locking done within direct-io.c into two cases -
generic filesystems and blkdev/XFS.  There is no locking done for the
second case, and we also never set the create parameter to the get_blocks
call (via direct_io_worker ->do_direct_IO->get_more_blocks) for that case. 
This meant that XFS was accidentally no longer being told when a direct IO
write was being performed, which in turn meant that XFS would (often -
depending on the inode's size and bmap) tell get_more_blocks that it was
mapping to a hole.  It also means that currently all direct writes into XFS
are falling back to buffered writes.  Further, skipping the i_alloc_sem
locking entirely is not correct for us, we are relying on that aspect of
the generic locking.

The fallback behaviour from direct to buffered is "silent", so we didn't
actually pick up on these problems until just recently, unfortunately.

The approach I've taken here is to split the blkdev/XFS case into two, and
corrected the new third case behaviour for the functionality XFS provides. 
The generic behavior used by other filesystems remains unchanged, as does
direct IO to the block device, and XFS now becomes fully functional.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add PTRACE_GETREGS and PTRACE_SETREGS functions for the native debugging
support of the GNU Project Debugger, GDB.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is for upgrading m32r's code to the 2.6.9-rc1-mm5 source as well as
the other architectures.

* arch/m32r/Makefile: Replace assigment to CHECK with assignment to CHECKFLAGS

* arch/m32r/kernel/vmlinux.lds.S:
	- out-of-line locks / m32r; Include LOCK_TEXT to .text section.
	- Move param section out of init area, for export of built-in
	  module params

* arch/m32r/mm/ioremap.c (__ioremap):
	Add __iomem modifier to the return value type of __ioremap()
	for much stricter type-checking.

* include/asm-m32r/resource.h:
	- rlimit-based mlocks for unprivileged users
	- Increase per-user mlock limit default to 32k	

* include/asm-m32r/socket.h:
	- [NET]: Move SOCK_foo types into linux/net.h

* include/asm-m32r/unistd.h:
  Add system calls; taken from asm-i386/unistd.h.
    - [PATCH][2/6] perfctr-2.7.3 for 2.6.7-rc1-mm1: i386  (05/31/2004)
    - [PATCH] Make key management use syscalls not prctls (09/06/2004)
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here is the fix for dio_new_bio() BUG() with fsx tests.  The problem is, I
changed dio_pages_in_io calculation to be exactly the number of pages we
needed to map the user-buffer to do the IO.  But with fine-grain alignment
(non fs-blocksize), we may need 2 more pages (ZERO_PAGE) to zero out first
and last block if needed.

Here is the bug info.

http://bugme.osdl.org/show_bug.cgi?id=3447Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a few warnings in radeonfb and add proper PLL divider values
for Apple latest PowerBook Aliminium 17" so the display isn't "fuzzy"
(the LVDS interface needs special PLL values that the driver can't
calculate, on most x86, the BIOS tells us the values to use, on Apple
laptops, we have to hard code them for each model).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The battery calculation code in via-pmu triggers a few warnings (and
actually, one of them would lead to a real error if we ever get an
unrecognized type from the PMU).  Fix this.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This makes the ADB->Linux keycodes conversion table a lot more readable
(and thus easy to fix :) and adds conversion of the laptop Fn-enter
(keypad enter, also present on apple laptop keyboards on the bottom
right, left of the arrow keys) to "compose" (or menu key on modern PC
keyboard).

Thanks to Frank Murphy <murphyf@f-m.fm> for spotting this keycode
feature of MacOS (and apple docs)

It also fixes a small possible race in the LED code
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is a gcc error, but let's fix it anyway, it isn't a perf critical
codepath and warnings are ugly.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Another bunch of annoying warnings gone, and code cleaned up.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

      and then went and used the looked up attribute...  Ooops.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into cantab.net:/home/src/ntfs-2.6-devel

- Fix bug found by the new sparse bitwise warnings where the default
  upcase table was defined as a pointer to wchar_t rather than ntfschar
  in fs/ntfs/ntfs.h and super.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

- Fix all the sparse bitwise warnings.  Had to change all the enums
  storing little endian values to #defines because we cannot set enums
  to be little endian so we had lots of bitwise warnings from sparse.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

- Add leMFT_REF data type to fs/ntfs/layout.h.
- Update all NTFS header files with the new little endian data types.
  Affected files are fs/ntfs/layout.h, logfile.h, and time.h.
- Do proper type casting when using ntfs_is_*_recordp() in
  fs/ntfs/logfile.c, mft.c, and super.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

- Add le{16,32,64} as well as sle{16,32,64} data types to fs/ntfs/types.h.
- Change ntfschar to be le16 instead of u16 in fs/ntfs/types.h.
- Add le versions of VCN, LCN, and LSN called leVCN, leLCN, and leLSN,
  respectively, to fs/ntfs/types.h.
- Update endianness conversion macros in fs/ntfs/endian.h to use the
  new types as appropriate.
- Do proper type casting when using sle64_to_cpup() in fs/ntfs/dir.c
  and index.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

This disables the sched domains debug code, which has a tendency to
print out a *lot* of information.  It's helpful for debugging, but a bit
overboard for general use.  Also, if you have a high NR_CPUS value, it
tends to scare people and overflow the dmesg buffer.
Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

        inode size has changed and to only output an error if so.
      - Rename fs/ntfs/attrib.h::attribute_value_length() to ntfs_attr_size().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

The code re-allocating new bus resources in case of conflicts use a
function called probe_resource(), which has a typo (spotted by the
uninitialized variable use of gcc) causing it to potentially return
bogus results. This fixes it:
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The changes to prom_init/offb interaction introduced by the ppc64
monster cleanup patch need a fix to ppc32 prom_init so that offb
works again. ppc32 prom_init() could use a lot more cleanup, but
let's do the minimal fix to make it work now.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The recent ppc64 changes for offb introduced an uninitialized pointer
use for ppc32, here's the fix:
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

A typo in pmac_feature.c can cause us to use a bogus node pointer when
iterating the i2c controllers during boot. Fortunately, it seems that
we always find the one we are looking for first, and thus never ended
up in an inifinite loop here, but let's fix it and fix the warning at
the same time.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

In chrp_setup.c, chrp_int_ack could be left uninitialized and passed
"as-is" to i8259_init() if the OF node for the 8259 wasn't found.  I
don't know if that should happen, but the i8259 code can deal with
int_ack beeing 0, so let's be safe, initialize it, and remove a warning
at the same time. 
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There's an obvious uninitialized return value in pmac_cpufreq, here's
a fix:
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When pci_assign_all_busses is set, the common code will re-assign all
the bus numbers, which we still need to do one various pmacs, at least
until XFree/XOrg understands PCI domains properly.  However, this
process triggers a bug if during this renumbering, on a given segment, a
P2P bridge not yet renumbered has conflicting downstream bus range with
a P2P bridge just renumbered.  The probing will just behave randomly and
either miss devices, show duplicates, or just lockup in some
circumstances.  This is typically triggered on Apple Xserve G4s who have
at least 2 P2P bridges built-in on the same segment of the first PCI
(non-AGP) domain

The "workaround" we use on pmac that was in my tree for a while but got
"lost" during the big merge a while ago is to offset the bus numbers
between domains by 16.  This avoids the above collision scenario in all
practical cases.

The long term solution of course is to stop renumbering and make sure
that all drivers are domain safe (there may be a couple issue remaining
in the code that matches PCI / OF devices on ppc32) and XFree/XOrg has
to be fixed.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into cantab.net:/home/src/ntfs-2.6-devel

into ppc970.osdl.org:/home/torvalds/v2.6/linux

From: Brett Russ <russb@emc.com>

The following code needs to be added to ide_end_drive_cmd(),
since ide_error() calls ide_end_drive_cmd() after ide_dump_status()
has left the registers pointing at the high order part of the LBA.
Using the taskfile ioctl will then lead to hobRegister[] and
subsequently hob_ports[] being loaded with the wrong values.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

into trik.(none):/home/bzolnier/bk/ide-2.6

From: Nicholas Reilly <nreilly@magma.ca>

I have a Shuttle SN41G2 and the secondary IDE channel alternates between
IRQ 15 (correct) and IRQ 7 (causing failures accessing the DVD+-RW which is
master, no slave and also messing with the parallel port if it is enabled)
on each boot.  This is running ACPI and APIC on 2.6.5, 2.6.7 and 2.6.8. 
dmesg, dmidecode and /proc/acpi/dsdt are all identical (apart from dmesg
printing of IRQ and errors it causes) regardless of whether it decides to
go on 7 or 15.  It is now running the latest BIOS, earlier BIOS did the
same.

bart: IRQ auto-detection sometimes fails and gets "screaming" IRQ
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux