Patch from Ben Dooks

Added EXPORT_SYMBOL() to appropriate routines

(should be applied after Patch 2226/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add sysfs class and devices for s3c24xx-dma code, and
add simple pm suspend code to ensure all channels are
stopped before suspending

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Silly #endif placement problem.

"platform_rename_gsi" does not exist unless CONFIG_ACPI_BOOT is defined.

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

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

Patch from Nicolas Pitre

This should be applied on top of patch #2154/1.

This maps the XIP kernel in the same virtual area as used for kernel
modules instead of the previous arbitrary location.  Doing so has the
advantage of having a well defined kernel address not conflicting
with the different definitions for VMALLOC_END, as well as making
modules loadable without any indirect long branch calls.  The work
on XIPable MTD also requires this with code marked __xipram for the
same reason.

This of course reduces the space available for kernel modules from
16MB to either 14MB or 12MB depending on the size of the resulting 
kernel but that shouldn't be a real issue at all, given that the
whole purpose behind XIP is to execute as much stuff from flash, 
which is better achieved by compiling drivers in the kernel directly.

Signed-off-by: Nicolas Pitre 
Signed-off-by: Russell King

Patch from Nicolas Pitre

This patch allows for the kernel to be configured for XIP.
A lot of people are using semi hacked up XIP patches already so
it is a good idea to have a generic and clean implementation 
supporting all ARM targets. The patch isn't too intrusive.

It involves:

- modifying the kernel entry code to map separate .text and .data
  sections in the initial page table, as well as relocating
  .data to ram when needed

- modifying the linker script to account for the different VMA and
  LMA for .data, as well as making sure that .init.data gets
  relocated to ram

- adding the final kernel mapping with a new MT_ROM mem type

- distinguishing between XIP and non-XIP for bootmem and memory
  resource declaration

- and adding proper target handling to Makefiles.

While at it, this also cleans up the kernel boot code a bit
so the kernel can now be compiled for any address in ram,
removing the need for a relation between kernel address and
start of ram.  Also throws in some more comments.

And finally the _text, _etext, _end and similar variables are now
declared extern void instead of extern char, or even extern int.
That allows for operations on their address directly without any
cast, and trying to reference them by mistake would yield an 
error which is a good thing.

Tested both configurations: XIP and non XIP, the later 
producing a kernel for execution from ram just as before.

Signed-off-by: Nicolas Pitre 
Signed-off-by: Russell King

Patch from Ben Dooks

Added symbol export to the file, and cleaned up the
un-necessary include files

Signed-off-by: Ben Dooks 
Signed-off-by: Russell King

into nuts.davemloft.net:/disk1/BK/net-2.6

Make sure kernel reads full size of elf data.  Error out if mmap fails
when mapping any sections of the executable.  Make sure interpreter
string is NULL terminated. 
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On Tue, Nov 09, 2004 at 01:38:11PM -0600, Jason.Jorgensen@comtrol.com wrote:
     On Tuesday, November 09, 2004 10:58 AM, Theodore Ts'o <tytso@mit.edu> wrote:
    > I developed the Rocketport device driver under contract of Comtrol,
    > with the understanding that the resulting device driver would be
    > released under the GPL.  So I believe the correct way of resolving the
    > conflicting copyright statements is to delete the following lines.
    > 
    > It would be good to get positive confirmation from Comtrol as well
    > that this is their understanding as well. 
   
     You are absolutely correct. That notice slipped by us and should not be in
     there. 
   
     If someone with access to the mainline source could remove that for us we
     would appreciate it.

Cc: Keith.Hammerbeck@comtrol.com, Steve.Erler@comtrol.com
Acked-by: Jason.Jorgensen@comtrol.com
Signed-off-by: "Theodore Ts'o" <tytso@thunk.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Only set the flag in the cases when the exit state is not either
TASK_DEAD or TASK_ZOMBIE.

(TASK_DEAD or TASK_ZOMBIE will either race or we'll return the 
information, so no need to note them).

I confirmed that this fixes the problem and I also ran some LTP tests
Signed-off-by: Dinakar Guniguntala <dino@in.ibm.com>
Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

- Cleanup fs/ntfs/aops.c::ntfs_{read,write}page() since we know that a
  resident attribute will be smaller than a page which makes the code
  simpler.  Also make the code more tolerant to concurrent ->truncate.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

Patch from Dave Jiang

Converting IOP321 UART to platform device
Remove asm/arch/serial.h dependency

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Dave Jiang

Clean up iop3xx timer routines and move to xtime_lock/timer_tick schemes
dependent on patch 2216/1

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Ben Dooks

Add a system device for the s3c2440 called s3c2440-core
to allow power management hooks for s3c2440 specific
registers to be added.

Signed-off-by: Ben Dooks 
Signed-off-by: Russell King

Patch from Ben Dooks

This patch does the following:

 - Save S3C2410_DCLKCON over sleep
 - Save all non-SDRAM memory bank config
 - Fix bug in setting PLL before clock divisor
 - Save all IRQ level controlls
 - Restore IRQ masks _after_ configuration restored
 - No debug until core registers restored

This patch also moves the pm save/restore list code
into the header, for other parts of arch/arm/mach-s3c2410
to use. Note, this is not a general invite for external
code to use these functions.

Also applied patch from Dimitry Andric to fix up the
spelling/typos in Documentation/arm/Samsung-S3C24XX/Suspend.txt

Signed-off-by: Ben Dooks 

Signed-off-by: Dimitry Andric 
Signed-off-by: Russell King

Patch from Ben Dooks

The following fixes are included:

 - fix the addresses of S3C2440_DSCx (off by 4)
 - SCK0/SCK1 definitions the wrong way around
 - renable ENABLE to DISABLE

Signed-off-by: Ben Dooks 
Signed-off-by: Russell King

- if alarm operations are NULL, don't allow alarm ioctls to succeed.
- if ops->ioctl is NULL, don't try to call NULL function.
- only display the alarm times in /proc/rtc if we successfully read
  the alarm time.

Patch from Ian Campbell

As discussed on the ARM Linux kernel mailing list. With edge triggered interrupts it is impossible to avoid spurious interrupts and so it makes sense to just ignore IRQ_NONE return values in this case. 

Signed-off-by: Ian Campbell 
Signed-off-by: Russell King

      fs/ntfs/aops.c::ntfs_prepare_write() for now as it is not safe.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

        Cannot just call fs/ntfs/aops.c::mark_ntfs_record_dirty() since
        this also marks the page dirty so we create the buffers by hand
        and set them uptodate.
      - Revert the removal of the page uptodate check from
        fs/ntfs/aops.c::mark_ntfs_record_dirty() as it is no longer called
        from fs/ntfs/mft.c::ntfs_sync_mft_mirror().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Before the RCU change distruction of the qdisc and all inner
qdiscs happend immediately and under the rtnl semaphore. This
made sure nothing holding the rtnl semaphore could end up with
invalid memory. This is not true anymore, inner qdiscs found on
dev->qdisc_list can be suddenly destroyed by the RCU callback.
nothing can find them until they get destroyed.

This also makes semantics sane again, an inner qdiscs should not
be user-visible once the containing qdisc has been destroyed. The
second part (locking in qdisc_lookup) is not really required, but
currently the only purpose of qdisc_tree_lock seems to be to protect
dev->qdisc_list, which is also protected by the rtnl. The rtnl is
especially relied on for making sure nobody frees a qdisc while it
is used in user-context, so qdisc_tree_lock looks unnecessary. I'm
currently reviewing all qdisc locking, if this turns out to be right
I will remove qdisc_tree_lock entirely in a follow-up patch, but for
now I left it in for consistency.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

We try to bind to the same source port when sending packets from the
same source IP/source port to the outside world.  Normally, this is
simple, since we always try to keep the same source port anyway, but
there are cases where that is not available.

This is a requirement for the Kegel Peer-to-Peer NAT paper:

	http://alumnus.caltech.edu/~dank/peer-nat.html

Unfortunately, our current implementation is useless.  It looks up a
hash to see if this srcip/srcpt has been used, but instead of
returning the mapping to use, it simply returns that same srcip/srcpt.
This is clearly wrong.  As pointed out by Krisztian Kovacs.

Also, we are no longer using the netfilter-special list iterators, so
we can split src_cmp, in_range and the actual result manipulation for
much clearer code.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Ax AX.25 connection is identified only by it's source and destination,
not by the device it's routed through, so fix the connection block
lookup to ignore the device of a connection.  This fixes dying connections
in case of an AX.25 routing flap.
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch fixes an scheduler/classifier module unload race.
struct Qdisc_ops which includes the owner field is also part
of the module's memory, so ops might already be freed when
try_module_get(ops->owner) is called outside of the locked
section.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

There is a small SMP race in ip6_del_rt where we maybe dereferencing a dst
that has been freed.  This patch fixes it.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Found another error-path dst leak.  If the idev->dead check is
triggered in ipv6_add_addr the rt entry will leak.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>