SGI Modid: xfs-linux:xfs-kern:174326a
Signed-off-by: Nathan Scott <nathans@sgi.com>

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

Use NULL, not 0, where appropriate.

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

- Remove 'arc' machine name from Makefile
- clk_set_rate() should return non-zero atm.
- proc-sa1100.S doesn't need asm/ptrace.h
- update mach-types
- kill line of spaces in clock.h

Generate SIZEOF_MACHINE_DESC using asm-offsets method rather than
relying on people updating the definition in asm/mach/arch.h

This places arch_adjust_zones along side ISA_DMA_THRESHOLD.  These
two are related, but having them in separate files means its not
obvious that they are.

ISA_DMA_THRESHOLD is a DMA mask which must be defined such that it
matches the memory handed out by GFP_DMA, which in turn is controlled
by arch_adjust_zones.

This allows machine classes to override ISA_DMA_THRESHOLD as
necessary.

Clean up bzImage target, remove a couple of obsolete testing targets,
and add better bootpImage help text.

This fixes the buggy decompressor assembly, and fixes PCMCIA IO
to use the correct byte lane when accessing certain PCMCIA cards.

Static data causes GOTOFF relocations to be used, which won't work
because we want to relocate the .data section separately from the
.text section.  Therefore, force all data to be nonstatic.

- use 'Image' target for kernel image to be compressed rather than
  duplicating its generation.
- use .incbin-based generation of ELF objects from binary data rather
  than 'ld'-based generation.

For clarity and consistency, use the same name for makefile and
linker symbols.

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

Since this is where these two variables are used, it makes sense to
have them in that makefile.  Also, consolidate "targets"
initialisation, fixes a missing FORCE dependency for the uImage rule,
and remove more FTVPCI code.

mm_struct.used_hugetlb used to eliminate costly find_vma() from
follow_page().  Now it is used only in ia64 version of follow_huge_addr(). 
I know nothing about ia64, but this REGION_NUMBER() looks simple enough to
kill used_hugetlb.

There is debug version (commented out) of follow_huge_addr() in i386 which
looks at used_hugetlb, but it can work without this check.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

radeonfb: fix 16bpp copyarea() bug

It turns out the bug was due to my mis-copying a certain set of flags from
the x.org tree.
Signed-off-by: David Eger <eger@havoc.gtf.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When using gcc 3.3.3 on alpha, the current BK head doesn't compile.

- there's an external declaration for abs() in the same scope as a macro
  definition in arch/alpha/time.c

- The compiler is picky about `const' declarations, which breaks on
  bitops.h.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

While writing some analysis tools for memory hot-remove, we came across a
single page which had a ->count that always increased, without bound.  It
ended up always being the zero page, and it was caused by a leaked
reference in some do_wp_page() code that ends up avoiding PG_reserved
pages.

Basically what happens is that page_cache_release()/put_page() ignore
PG_reserved pages, while page_cache_get()/get_page() go ahead and take the
reference.  So, each time there's a COW fault on the zero-page, you get a
leaked page->count increment.

It's pretty rare to have a COW fault on anything that's PG_reserved, in
fact, I can't think of anything else that this applies to other than the
zero page.

In any case, it the bug doesn't cause any real problems, but it is a bit of
an annoyance and is obviously incorrect.  We've been running with this
patch for about 3 months now, and haven't run into any problems with it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

<linux/fd.h> references __user which is defined in <linux/compiler.h>.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - fix documentation
 - use $(src) in Makefile (fixes cross-compilation)

Both spottet by Geert Uytterhoeven
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add m68k support to checkstack.pl

Regular expression combination by Andres Schwab

Signed-off-by: <geert@linux-m68k.org>
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch implements dma_get_required_mask() which may be used by drivers
to probe the optimal DMA descriptor type they should be implementing on the
platform.

I've also tested it this time with the sym_2 driver...making it chose the
correct descriptors for the platform.  (although I don't have a 64 bit
platform with >4GB memory, so I only confirmed it selects the 32 bit
descriptors all the time...)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Well, one of these (fs/block_dev.c) is little non-trivial, but i felt
throwing that away would be a shame (and I did add comments ;-).

Also almost all of these have been submitted earlier through other
channels, but have not been picked up (the only controversial is again the
fs/block_dev.c patch, where Linus felt a better job would be done with
__ffs(), but I could not convince myself that is does the same thing as
original code).
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Currently, the x86/x86_64 real-mode kernel setup code reads and stores the
mbr_signature (4 bytes in the MBR at offset 440 decimal) for BIOS int13h
device 80h only.  This is useful, but not as useful as if we stored such
signatures for all int13h devices.  Think OS installer wanting to set up md
software RAID across several BIOS disks.

Patch below against 2.6.7 allows the storing of the mbr_signature for the
first 16 BIOS int13h devices, and exports them via
/sys/firmware/edd/int13_dev8x/mbr_signature as before.

This also merges the three EXPORT_SYMBOLs that setup.c exported for edd.c's
use into one.
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/video/console/fbcon.c:310: warning: comparison is always true due
to limited range of data type

char can be either signed or unsigned, depending on the target system.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- fix unbalanced invocation of pci_enable_device();

- leaks plugged in cirrusfb_zorro_setup();

- move framebuffer_release() into cirrusfb_{pci/zorro}_unmap() to balance
  cirrusfb_{pci/zorro}_setup();

- make cirrusfb_{pci/zorro}_setup() return adequate error codes when
  something fails;

- cirrusfb_zorro_unmap: iounmap() now take as argument values previously
  returned by ioremap().
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David Eger <eger@havoc.gtf.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This updates MAINTAINERS for sh/sh64 to match up with the 2.4 entries.

I've also removed NIIBE-san as an active sh maintainer, since he hasn't
been involved or submitted any code since 2002/06/26.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Since James confirmed that this doesn't need to be module specific, we get
rid of the #ifndef MODULE checks for both the modedb and the modedb lookup.

Additionally we also switch from memset_io() to fb_memset().
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If the syscall table is in the text section, the movi that loads its
address into a register will at link time have its immediates resolved as
though it's an SHmedia symbol, i.e.  the LSB will be 1.  This is then
misaligned as a base address for loading the address to jump to.

This could be fixed either by moving the table back to the .data section
(as done here), or by masking off the LSB after loading the table address
into a register.
Signed-off-by: Richard Curnow <richard.curnow@superh.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch adds sh64 support.

This is a bit overdue, as this was on the should-fix list, though we
weren't done debugging and finishing off the port until just recently (I
did a port against 2.5.68 but it wasn't in any shape to be merged).

sh64 is already in 2.4 and has been for quite awhile, so this is mostly
just a forward port of that code to 2.6 with appropriate bug fixes, etc.
along the way.  There isn't much in the way of new features that have been
added to the port yet, though I have added rough hugetlb and oprofile
support.

This patch doesn't really touch any common code, with the exception of an
ifdef or two for keyboard support and an ifdef in fb.h to omit sh64 from
the __raw_xxx() wrapping that sh does.

The only other common driver changes were to sh-sci for serial support, but
those bits were already merged with the latest batch of sh-sci updates.

Beyond that, the port is completely isolated.
Signed-off-by: Richard Curnow <richard.curnow@superh.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some hpet clean up and a fix to the RTC request_irq issue.
Signed-off-by: Bob Picco <Robert.Picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The intention here is to have no effect on pSeries except:

1) vio_register_device is renamed to vio_register_device_node to better
   reflect is purpose and to allow me to introduce
   vio_register_device_iseries.

2) I have introduced the name and type fields in struct vio_dev to make
   these two fields independent of subarchitecture.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>