06 Feb, 2008

40 commits

  • Acked-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Acked-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • ide-cris.c:
    * Add cris_setup_ports() helper and use it instead of ide_setup_ports()
    (fixes random value being set in ->io_ports[IDE_IRQ_OFFSET]).

    buddha.c:
    * Add buddha_setup_ports() helper and use it instead of ide_setup_ports().

    falconide.c:
    * Add falconide_setup_ports() helper and use it instead of ide_setup_ports(),
    also fix return value of falconide_init() while at it.

    gayle.c:
    * Add gayle_setup_ports() helper and use it instead of ide_setup_ports().

    macide.c:
    * Add macide_setup_ports() helper and use it instead of ide_setup_ports()
    (fixes incorrect value being set in ->io_ports[IDE_IRQ_OFFSET]).

    q40ide.c:
    * Fix q40_ide_setup_ports() comments.

    ide.c:
    * Remove no longer needed ide_setup_ports().

    Cc: Mikael Starvik
    Cc: Geert Uytterhoeven
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Same BUG_ON() is present inside ide_set_handler().

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * Remove write-only ->sata_misc[] from ide_hwif_t.

    * Remove no longer used SATA_{MISC,PHY,IEN}_OFFSET defines.

    Acked-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * Replace incorrect CONFIG_BLK_DEV_IDE #ifdef in
    check_media_bay() by CONFIG_MAC_FLOPPY one.

    * Replace incorrect CONFIG_BLK_DEV_IDE #ifdef-s by
    CONFIG_BLK_DEV_IDE_PMAC ones.

    * check_media_bay() is used only by drivers/block/swim3.c
    so make this function available only if CONFIG_MAC_FLOPPY
    is defined.

    * check_media_bay_by_base() and media_bay_set_ide_infos()
    are used only by drivers/ide/ppc/pmac.c so so make these
    functions available only if CONFIG_MAC_FLOPPY is defined.

    v2:
    * Remove ifdefs from function prototypes. (Andrew Morton)

    Cc: Benjamin Herrenschmidt
    Cc: Andrew Morton
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • with module_param macro, the __setup code can be killed now:
    const __setup("all-generic-ide", ide_generic_all_on);

    and the module name "generic.ko" is not descriptive to its functionality,
    can be changed in Makefile, the "ide-pci-generic.ko" is better.

    the ide-pci-generic.all-generic-ide parameter also documented
    in Documentation/kernel-parameters.txt

    Signed-off-by: Denis Cheng
    Cc: Greg Kroah-Hartman
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Denis Cheng
     
  • drivers/ide/legacy/hd.c: In function 'hd_request':
    drivers/ide/legacy/hd.c:424: warning: 'stat' may be used uninitialized in this function

    gcc is being stupid.

    Signed-off-by: Andrew Morton
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Andrew Morton
     
  • drivers/ide/ide-acpi.c: In function 'ide_acpi_init':
    drivers/ide/ide-acpi.c:175: warning: 'dev_handle' may be used uninitialized in this function

    Signed-off-by: Andrew Morton
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Andrew Morton
     
  • This is Palmchip BK3710 IDE controller support.

    The IDE controller logic supports PIO, MultiWord-DMA and Ultra-DMA modes.
    Supports interface to Compact Flash (CF) configured in True-IDE mode.

    Bart:
    - remove dead code
    - fix ide_hwif_setup_dma() build problem

    Signed-off-by: Anton Salnikov
    Reviewed-by: Alan Cox
    Reviewed-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Anton Salnikov
     
  • On Tuesday 05 February 2008, Linus Torvalds wrote:
    >
    > On Sat, 2 Feb 2008, Bartlomiej Zolnierkiewicz wrote:
    > >
    > > * next part of IDE probing code re-organization saga
    > >   (that would be me)
    >
    > This seems to cause very irritating and bogus messages for me:
    >
    >       Probing IDE interface ide0...
    >       Probing IDE interface ide1...
    >       ide2: I/O resource 0x0-0x7 not free.
    >       ide2: ports already in use, skipping probe
    >       ide3: I/O resource 0x0-0x7 not free.
    >       ide3: ports already in use, skipping probe
    >       ide4: I/O resource 0x0-0x7 not free.
    >       ide4: ports already in use, skipping probe
    >       ide5: I/O resource 0x0-0x7 not free.
    >       ide5: ports already in use, skipping probe
    >       ide6: I/O resource 0x0-0x7 not free.
    >       ide6: ports already in use, skipping probe
    >       ide7: I/O resource 0x0-0x7 not free.
    >       ide7: ports already in use, skipping probe
    >       ide8: I/O resource 0x0-0x7 not free.
    >       ide8: ports already in use, skipping probe
    >       ide9: I/O resource 0x0-0x7 not free.
    >       ide9: ports already in use, skipping probe
    >
    > and that's just totally bogus. It shouldn't even request that region,
    > since it's not been allocated!

    The commit 139ddfcab50e5eabcc88341c8743a990ac1be6a2 ("ide: move handling of
    I/O resources out of ide_probe_port()") changed the ordering of hwif->noprobe
    check vs ide_hwif_request_regions() call (so that we now reserve I/O regions
    before checking for hwif->noprobe). However ide-generic host driver depended
    on hwif->noprobe to be set for skipping probing of empty ide_hwifs[] slots.

    Fix it by passing only indexes of non-empty slots to ide_device_add_all()
    from ide_generic_init().

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] make pfm_get_task work with virtual pids
    [IA64] honor notify_die() returning NOTIFY_STOP
    [IA64] remove dead code: __cpu_{down,die} from !HOTPLUG_CPU
    [IA64] Appoint kvm/ia64 Maintainers
    [IA64] ia64_set_psr should use srlz.i
    [IA64] Export three symbols for module use
    [IA64] mca style cleanup
    [IA64] sn_hwperf semaphore to mutex
    [IA64] generalize attribute of fsyscall_gtod_data
    [IA64] efi.c Add /* never reached */ annotation
    [IA64] efi.c Spelling/punctuation fixes
    [IA64] Make efi.c mostly fit in 80 columns
    [IA64] aliasing-test: fix gcc warnings on non-ia64
    [IA64] Slim-down __clear_bit_unlock
    [IA64] Fix the order of atomic operations in restore_previous_kprobes on ia64
    [IA64] constify function pointer tables
    [IA64] fix userspace compile error in gcc_intrin.h

    Linus Torvalds
     
  • * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
    [S390] dcss: Initialize workqueue before using it.
    [S390] Remove BUILD_BUG_ON() in vmem code.
    [S390] sclp_tty/sclp_vt220: Fix scheduling while atomic
    [S390] dasd: fix panic caused by alias device offline
    [S390] dasd: add ifcc handling
    [S390] latencytop s390 support.
    [S390] Implement ext2_find_next_bit.
    [S390] Cleanup & optimize bitops.
    [S390] Define GENERIC_LOCKBREAK.
    [S390] console: allow vt220 console to be the only console
    [S390] Fix couple of section mismatches.
    [S390] Fix smp_call_function_mask semantics.
    [S390] Fix linker script.
    [S390] DEBUG_PAGEALLOC support for s390.
    [S390] cio: Add shutdown callback for ccwgroup.
    [S390] cio: Update documentation.
    [S390] cio: Clean up chsc response code handling.
    [S390] cio: make sense id procedure work with partial hardware response

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    [PKT_SCHED]: vlan tag match
    [NET]: Add if_addrlabel.h to sanitized headers.
    [NET] rtnetlink.c: remove no longer used functions
    [ICMP]: Restore pskb_pull calls in receive function
    [INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations.
    [NET]: Remove further references to net-modules.txt
    bluetooth rfcomm tty: destroy before tty_close()
    bluetooth: blacklist another Broadcom BCM2035 device
    drivers/bluetooth/btsdio.c: fix double-free
    drivers/bluetooth/bpa10x.c: fix memleak
    bluetooth: uninlining
    bluetooth: hidp_process_hid_control remove unnecessary parameter dealing
    tun: impossible to deassert IFF_ONE_QUEUE or IFF_NO_PI
    hamradio: fix dmascc section mismatch
    [SCTP]: Fix kernel panic while received AUTH chunk with BAD shared key identifier
    [SCTP]: Fix kernel panic while received AUTH chunk while enabled auth
    [IPV4]: Formatting fix for /proc/net/fib_trie.
    [IPV6]: Fix sysctl compilation error.
    [NET_SCHED]: Add #ifdef CONFIG_NET_EMATCH in net/sched/cls_flow.c (latest git broken build)
    [IPV4]: Fix compile error building without CONFIG_FS_PROC
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    [SPARC64] pci_sun4v.c: Section fixes.

    Linus Torvalds
     
  • * 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
    agp: remove flush_agp_mappings calls from new flush handling code
    intel-agp: introduce IS_I915 and do some cleanups..
    [intel_agp] fix name for G35 chipset
    intel-agp: fixup resource handling in flush code.
    intel-agp: add new chipset ID
    agp: remove unnecessary pci_dev_put
    agp: remove uid comparison as security check
    fix AGP warning
    agp/intel: Add chipset flushing support for i8xx chipsets.
    intel-agp: add chipset flushing support
    agp: add chipset flushing support to AGP interface

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    RDMA/nes: Add a driver for NetEffect RNICs
    IB/mthca: Return proper error codes from mthca_fmr_alloc()
    IB: Avoid marking __devinitdata as const
    IB/mlx4: Actually print out the driver version
    IB/ib_mthca: Pre-link receive WQEs in Tavor mode
    IB/mthca: Remove checks for srq->first_free < 0
    IB/fmr_pool: Allocate page list for pool FMRs only when caching enabled
    IB/srp: Retry stale connections
    mlx4_core: Don't read reserved fields in mlx4_QUERY_ADAPTER()
    IB/mthca: Don't read reserved fields in mthca_QUERY_ADAPTER()
    IPoIB: Remove a misleading debug print
    IPoIB: Handle bonding failover race for connected neighbours too
    IB/mthca: Fix and simplify page size calculation in mthca_reg_phys_mr()
    IB/ehca: Add PMA support
    IB/ehca: Update sma_attr also in case of disruptive config change
    IB/ehca: Prevent sending UD packets to QP0
    IB/cm: Add interim support for routed paths
    mlx4_core: Fix more section mismatches

    Linus Torvalds
     
  • Also fixed the include syntax while I was there.

    Signed-off-by: Jeff Dike
    Cc: Pavel Emelyanov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Redo the calculation of NR_syscalls since that disappeared from i386 and
    use a similar mechanism on x86_64.

    We now figure out the size of the system call table in arch code and stick
    that in syscall_table_size. arch/um/kernel/skas/syscall.c defines
    NR_syscalls in terms of that since its the only thing that needs to know
    how many system calls there are.

    The old mechananism that was used on x86_64 is gone.

    arch/um/include/sysdep-i386/syscalls.h got some formatting since I was
    looking at it.

    Signed-off-by: Jeff Dike
    Cc: WANG Cong
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Tweak the UML defconfig -
    we probably don't need 256 old-style ptys - this slows down udev
    noticably
    enable hostfs
    disable slab debugging - another noticable performance hit

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • The port_sem is already used as a mutex since it's using DECLARE_MUTEX(), but
    the underlying construct is still a semaphore .. This patch switches it over
    to a struct mutex.

    Signed-off-by: Daniel Walker
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Daniel Walker
     
  • The plug_mem_mutex is already used as a mutex since it's using
    DECLARE_MUTEX(), but the underlying construct is still a semaphore .. This
    patch switches it over to a struct mutex.

    Signed-off-by: Daniel Walker
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Daniel Walker
     
  • The ldt.semaphore conforms to the new struct mutex requirments, so I converted
    it to use the new API and changed the name.

    Signed-off-by: Daniel Walker
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Daniel Walker
     
  • Downgrade one of the MAC validity checks. If it's one that could be possibly
    assigned to a physical NIC, then nothing will break. So, emit a warning in
    this case, but keep the requested MAC.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • This patch takes care of a problem with the stopping code.

    The function inside the while condition returns 0 to signify a problem. A
    problem could be for example a bad command or a bad version of the mconsole
    client. A bad command would terminate the stopping loop and resume the
    kernel. This is a problem.

    A better solution is to make the loop infinite and don't leave it until we are
    explicitly told to.

    Signed-off-by: Karol Swietlicki
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Karol Swietlicki
     
  • John Reiser noticed that a physical memory region was being mapped twice.

    This patch fixes that, and it inlines the responsible function, as that had
    only one caller.

    Cc: John Reiser
    Signed-off-by: Jeff Dike

    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • TOPDIR is obsolete, use srctree instead. This patch removes TOPDIR from all
    UML Makefiles.

    Cc: Sam Ravnborg
    Signed-off-by: WANG Cong
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    WANG Cong
     
  • The 3-level page table fixes forgot to remove a couple now-unused fields from
    struct mm_context.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Calling init_registers inside the skas3 checking causes mysterious crashes if
    it doesn't happen because the skas3 checking is bypassed. This patch moves it
    to os_early_checks.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Some printks were missing newlines.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Style fixes in arch/um/sys-x86_64:
    updated copyrights
    CodingStyle fixes
    added severities to printks which needed them

    A bunch of functions in sys-*/ptrace_user.c turn out to be unused, so they and
    their declarations are gone.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • avoid-overflows-in-kernel-timec.patch makes CONFIG_HZ necessary for a
    successful build. UML lacks a definition, so this patch adds one. It also
    changes the hard-wired definition of HZ to CONFIG_HZ.

    Note: this patch is a good idea even in the absence of hpa's time fixes.

    Cc: "H. Peter Anvin"
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • A couple more DEBUG_SHIRQ fixes.

    The previous mconsole blocking fix exposed the lack of O_NONBLOCK on the
    mconsole socket.

    Also, winch_interrupt started crashing because it is called at irq free time
    and it tries to dereference tty->driver_data, which has already been set to
    NULL.

    I added some error cleanup in mconsole_init while I was there.

    Cc: "Karol Swietlicki"
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • The fakehd switch lost its implementation at some point. Since no one is
    screaming for it, we might as well remove it.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • The .a flags in openflags never had an implementation.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Add some more commentary about various pieces of global data not needing
    locking.

    Also got rid of unmap_physmem since that is no longer used.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • init_irq_signals doesn't need to be called from the context of a new process.
    It initializes handlers, which are useless in process context. With that call
    gone, init_irq_signals has only one caller, so it can be inlined into
    init_new_thread_signals.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • This patch tidies the signal handling code slightly.

    pending is renamed to signals_pending for symmetry with signals_enabled.

    remove_sigstack was unused, so can be deleted.

    The value of change_sig was never used, so it is now void and the
    return value is not calculated any more.

    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • To convert from tv_nsec to tv_usec, one needs to divide by 1000, not multiply.

    Signed-off-by: Dominique Quatravaux
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dominique Quatravaux
     
  • Joe Perches noticed some printks in smp.c that needed fixing.

    While I was in there, I did the usual tidying in arch/um/kernel, which
    should be fairly style-clean at this point:
    copyright updates
    emacs formatting comments removal
    include tidying
    style fixes

    Cc: Joe Perches
    Signed-off-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike