1. 08 Jun, 2007 18 commits
    • Paul Mundt's avatar
      sh: Fix SH-4 CPU selects. · 05627486
      Paul Mundt authored
      
      
      Now that select no longer works for selecting the "closest" CPU,
      we have to explicitly reference the precise sub-type in the few
      places where it actually matters (presently only setup code and
      some legacy sh-sci cruft).
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      05627486
    • Paul Mundt's avatar
      sh: Rip out special unknown machvec. · fd8f20e8
      Paul Mundt authored
      
      
      This kills off the BareCPU board as a "special" machvec, rather,
      we leave this as a default for when no other vector is available,
      or when we want to use it in combination with other vectors for
      testing with generic ops. As sh_mv is copied out anyways (or
      overloaded when an alternate vector is explicitly selected), this
      doesn't consume any additional memory.
      
      The generic machvec can be forcibly selected with sh_mv=generic,
      or by not having any other boards enabled.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      fd8f20e8
    • Paul Mundt's avatar
      sh: Kill off machvec aliases. · 82f81f47
      Paul Mundt authored
      
      
      We now throw all of the machvecs in to .machvec.init and either
      select one on the command line, or copy out the first (and
      usually only) one to sh_mv. The rest are freed as usual.
      
      This gets rid of all of the silly sh_mv aliasing and makes the
      selection explicit rather than link-order dependent.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      82f81f47
    • Paul Mundt's avatar
      sh: Get multiple boards in one image working again. · 25f8151b
      Paul Mundt authored
      
      
      This tidies up the build rules and permits multiple boards to be
      linked in to the same kernel. The earlier Kconfig work ensures that
      the CPU configuration is consistent across the boards, as this is
      the only thing that we can't do dynamically.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      25f8151b
    • Paul Mundt's avatar
      sh: Fixup cmdline handling from machvec changes. · ba36197c
      Paul Mundt authored
      
      
      The command line wasn't being saved off properly after the machvec
      changes went in, fix it up.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      ba36197c
    • Paul Mundt's avatar
      sh: Rework CPU/board dependencies. · f3d22298
      Paul Mundt authored
      
      
      This was a big mess, rework the logic a bit so that we constrain
      to a particular subtype and figure out the board support based
      on that. This makes building subtype specific kernels supporting
      multiple boards possible again.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      f3d22298
    • Paul Mundt's avatar
      sh: Shut up SH2-DSP compile warnings. · 882c12c4
      Paul Mundt authored
      
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      882c12c4
    • Paul Mundt's avatar
      sh: Fixup machvec support. · 9655ad03
      Paul Mundt authored
      
      
      This fixes up much of the machvec handling, allowing for it to be
      overloaded on boot. Making practical use of this still requires
      some Kconfig munging, however.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      9655ad03
    • Paul Mundt's avatar
      sh: __user annotations for __get/__put_user(). · e08f457c
      Paul Mundt authored
      
      
      This adds in some more __user annotations. These weren't being
      handled properly in some of the __get_user and __put_user paths,
      so tidy those up.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      e08f457c
    • Paul Mundt's avatar
      sh: Split out CPU topology initialization. · 7a302a96
      Paul Mundt authored
      
      
      Split out the CPU topology initialization to a separate file,
      and switch it to a percpu type, rather than an NR_CPUS array.
      
      At the same time, switch to only registering present CPUs,
      rather than using the possible CPU map.
      
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      7a302a96
    • Bryan Wu's avatar
      RAMFS NOMMU: missed POSIX UID/GID inode attribute checking · 85f6038f
      Bryan Wu authored
      
      
      This bug was caught by LTP testcase fchmod06 on Blackfin platform.
      
      In the manpage of fchmod, "EPERM: The effective UID does not match the
      owner of the file, and the process is not privileged (Linux: it does not
      have the CAP_FOWNER capability)."
      
      But the ramfs nommu code missed the inode_change_ok POSIX UID/GID
      verification. This patch fixed this.
      
      Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
      Cc: David Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      85f6038f
    • Linus Torvalds's avatar
      Merge git://git.linux-xtensa.org/kernel/xtensa-feed · c8d8170f
      Linus Torvalds authored
      * git://git.linux-xtensa.org/kernel/xtensa-feed:
        Xtensa: use asm-generic/fcntl.h
        [XTENSA] Remove non-rt signal handling
        [XTENSA] Move common sections into bss sections
        [XTENSA] clean-up header files
        [XTENSA] Use generic 64-bit division
        [XTENSA] Remove multi-exported symbols from xtensa_ksyms.c
        [XTENSA] fix sources using deprecated assembler directive
        [XTENSA] Spelling fixes in arch/xtensa
        [XTENSA] fix bit operations in bitops.h
      c8d8170f
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 34750bb1
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix SBUS IRQ regression caused by PCI-E driver.
        [SPARC64]: Fix 2 bugs in PCI Sabre bus scanning.
      34750bb1
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · df3872a9
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
        xfrm: Add security check before flushing SAD/SPD
        [NET_SCHED]: Fix filter double free
        [NET]: Avoid duplicate netlink notification when changing link state
        [UDP]: Revert 2-pass hashing changes.
        [AF_UNIX]: Fix stream recvmsg() race.
        [NETFILTER]: nf_conntrack_amanda: fix textsearch_prepare() error check
        [NETFILTER]: ip_tables: fix compat related crash
        [NETFILTER]: nf_conntrack: fix helper module unload races
        [RTNETLINK]: ifindex 0 does not exist
        [NETLINK]: Mark netlink policies const
        [TCP] tcp_probe: Attach printf attribute properly to printl().
        [TCP]: Use LIMIT_NETDEBUG in tcp_retransmit_timer().
        [NET]: Merge dst_discard_in and dst_discard_out.
        [RFKILL]: Make rfkill->name const
        [IPV4]: Restore old behaviour of default config values
        [IPV4]: Add default config support after inetdev_init
        [IPV4]: Convert IPv4 devconf to an array
        [IPV4]: Only panic if inetdev_init fails for loopback
        [TCP]: Honour sk_bound_dev_if in tcp_v4_send_ack
        [BNX2]: Update version and reldate.
        ...
      df3872a9
    • Steven Rostedt's avatar
      enable interrupts in user path of page fault. · e5e3c84b
      Steven Rostedt authored
      
      
      This is a minor fix, but what is currently there is essentially wrong.
      In do_page_fault, if the faulting address from user code happens to be
      in kernel address space (int *p = (int*)-1; p = 0xbed;)  then the
      do_page_fault handler will jump over the local_irq_enable with the
      
        goto bad_area_nosemaphore;
      
      But the first line there sees this is user code and goes through the
      process of sending a signal to send SIGSEGV to the user task. This whole
      time interrupts are disabled and the task can not be preempted by a
      higher priority task.
      
      This patch always enables interrupts in the user path of the
      bad_area_nosemaphore.
      
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e5e3c84b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · c52ecdab
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] pxa: fix pxa27x keyboard driver
        [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
        [ARM] 4421/1: AT91: Value of _KEY fields.
        [ARM] Solve buggy smp_processor_id() usage
        [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA)
        [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending
        [ARM] 4418/1: AT91: Number of programmable clocks differs
        [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S
      c52ecdab
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · dc315011
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Fix warning by moving do_default_vi into CONFIG_CPU_MIPSR2_SRS
        [MIPS] Fix some minor typoes in arch/mips/Kconfig.
        [MIPS] Remove prototype for deleted function qemu_handle_int
        [MIPS] Fix some system calls with long long arguments
        [MIPS] Make dma_map_sg handle sg elements which are longer than one page
        [MIPS] Drop __ARCH_WANT_SYS_FADVISE64
        [MIPS] Fix VGA corruption on RM300C
        [MIPS] RM300: Fix MMIO problems by marking the PCI INT ACK region busy
        [MIPS] EMMA2RH: remove dead KGDB code
        [MIPS] Remove duplicate fpu enable hazard code.
        [MIPS] Atlas, Malta, SEAD: Remove scroll from interrupt handler.
      dc315011
    • Peter Zijlstra's avatar
      frv: build fix · 2c750edd
      Peter Zijlstra authored
      
      
      In file included from /usr/src/linux-2.6-2/net/ipv4/ip_input.c:118:
      
        include2/asm/system.h:245: error: parse error before "__cmpxchg_32"
        include2/asm/system.h:245: error: parse error before '*' token
        include2/asm/system.h:245: warning: type defaults to `int' in declaration of `__cmpxchg_32'
        include2/asm/system.h:245: warning: function declaration isn't a prototype
        include2/asm/system.h:245: warning: data definition has no type or storage class
      
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2c750edd
  2. 07 Jun, 2007 22 commits