Eric Lee / smarc-fsl-linux-kernel

17 Oct, 2006

6 commits

16 Oct, 2006

2 commits

13 Oct, 2006

2 commits

  • b8a3ad5b5   Include proper header file for PFN_DOWN() ... Browse Code »

    The recent commit (99a10a60ba9bedcf5d70ef81414d3e03816afa3f) to fix up
    mmap_kmem() broke compiles because it used PFN_DOWN() without including
    .

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • 99a10a60b   [PATCH] Fix up mmap_kmem ... Browse Code »

    vma->vm_pgoff is an pfn _offset_ relatif to the begining
    of the memory start. The previous code was doing at first:

    vma->vm_pgoff << PAGE_SHIFT

    which results into a wrong physical address since some
    platforms have a physical mem start that can be different
    from 0. After that the previous call __pa() on this
    wrong physical address, however __pa() is used to convert
    a _virtual_ address into a physical one.

    This patch rewrites this convertion. It calculates the
    pfn of PAGE_OFFSET which is the pfn of the mem start
    then it adds the vma->vm_pgoff to it.

    It also uses virt_to_phys() instead of __pa() since the
    latter shouldn't be used by drivers.

    Signed-off-by: Franck Bui-Huu
    Signed-off-by: Linus Torvalds

    Franck Bui-Huu
     

12 Oct, 2006

3 commits

11 Oct, 2006

2 commits

10 Oct, 2006

5 commits

08 Oct, 2006

2 commits

  • ba00003aa   Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ... Browse Code »

    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    [POWERPC] PReP fixup after irq changes
    [POWERPC] SPU fixup after irq changes
    [POWERPC] Fix up after irq changes
    [POWERPC] Fix iseries/smp.c for irq breakage
    [POWERPC] Fix viocons for irq breakage
    [POWERPC] Update iseries_defconfig
    [POWERPC] Fix fsl_soc build breaks
    [POWERPC] Minor fix for bootargs property
    [POWERPC] Update MTFSF_L() comment
    [POWERPC] Update pSeries defconfig for SATA
    [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ
    [POWERPC] Fix zImage decompress location
    [POWERPC] linux,tce-size property is 32 bits
    [POWERPC] Add DTS for MPC8349E-mITX board
    [POWERPC] Fix harmless typo
    [PPC] Fix some irq breakage with ARCH=ppc

    Linus Torvalds
     
  • 2850bc273   [PATCH] m68k pt_regs fixes ... Browse Code »

    m68k_handle_int() split in two functions: __m68k_handle_int() takes
    pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs
    *.

    Places where we used to call m68k_handle_int() recursively with the same
    pt_regs have simply lost the second argument, the rest is switched to
    __m68k_handle_int().

    The rest of patch is just dropping pt_regs * where needed.

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     

07 Oct, 2006

3 commits

06 Oct, 2006

1 commit

05 Oct, 2006

2 commits

  • 7d12e780e   IRQ: Maintain regs pointer globally rather than passing to IRQ handlers ... Browse Code »

    Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
    of passing regs around manually through all ~1800 interrupt handlers in the
    Linux kernel.

    The regs pointer is used in few places, but it potentially costs both stack
    space and code to pass it around. On the FRV arch, removing the regs parameter
    from all the genirq function results in a 20% speed up of the IRQ exit path
    (ie: from leaving timer_interrupt() to leaving do_IRQ()).

    Where appropriate, an arch may override the generic storage facility and do
    something different with the variable. On FRV, for instance, the address is
    maintained in GR28 at all times inside the kernel as part of general exception
    handling.

    Having looked over the code, it appears that the parameter may be handed down
    through up to twenty or so layers of functions. Consider a USB character
    device attached to a USB hub, attached to a USB controller that posts its
    interrupts through a cascaded auxiliary interrupt controller. A character
    device driver may want to pass regs to the sysrq handler through the input
    layer which adds another few layers of parameter passing.

    I've build this code with allyesconfig for x86_64 and i386. I've runtested the
    main part of the code on FRV and i386, though I can't test most of the drivers.
    I've also done partial conversion for powerpc and MIPS - these at least compile
    with minimal configurations.

    This will affect all archs. Mostly the changes should be relatively easy.
    Take do_IRQ(), store the regs pointer at the beginning, saving the old one:

    struct pt_regs *old_regs = set_irq_regs(regs);

    And put the old one back at the end:

    set_irq_regs(old_regs);

    Don't pass regs through to generic_handle_irq() or __do_IRQ().

    In timer_interrupt(), this sort of change will be necessary:

    - update_process_times(user_mode(regs));
    - profile_tick(CPU_PROFILING, regs);
    + update_process_times(user_mode(get_irq_regs()));
    + profile_tick(CPU_PROFILING);

    I'd like to move update_process_times()'s use of get_irq_regs() into itself,
    except that i386, alone of the archs, uses something other than user_mode().

    Some notes on the interrupt handling in the drivers:

    (*) input_dev() is now gone entirely. The regs pointer is no longer stored in
    the input_dev struct.

    (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
    something different depending on whether it's been supplied with a regs
    pointer or not.

    (*) Various IRQ handler function pointers have been moved to type
    irq_handler_t.

    Signed-Off-By: David Howells
    (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)

    David Howells
     
  • fefd26b3b   Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh ... Browse Code »

    * master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
    Remove all inclusions of

    Manually resolved trivial path conflicts due to removed files in
    the sound/oss/ subdirectory.

    Linus Torvalds
     

04 Oct, 2006

12 commits

  • 5a96c5d0c   Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6 ... Browse Code »

    * master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6: (41 commits)
    [PARISC] Kill wall_jiffies use
    [PARISC] Honour "panic_on_oops" sysctl
    [PARISC] Fix fs/binfmt_som.c
    [PARISC] Export clear_user_page to modules
    [PARISC] Make DMA routines more stubby
    [PARISC] Define pci_get_legacy_ide_irq
    [PARISC] Fix CONFIG_DEBUG_SPINLOCK
    [PARISC] Fix HPUX compat compile with current GCC
    [PARISC] Fix iounmap compile warning
    [PARISC] Add support for Quicksilver AGPGART
    [PARISC] Move LBA and SBA register defines to the common ropes.h
    [PARISC] Create shared header
    [PARISC] Stash the lba_device in its struct device drvdata
    [PARISC] Generalize IS_ASTRO et al to take a parisc_device like
    [PARISC] Pretty print the name of the lba type on kernel boot
    [PARISC] Remove some obsolete comments and I checked that Reo is similar to Ike
    [PARISC] Add hardware found in the rp8400
    [PARISC] Allow nested interrupts
    [PARISC] Further updates to timer_interrupt()
    [PARISC] remove halftick and copy clocktick to local var (gcc can optimize usage)
    ...

    Linus Torvalds
     
  • 13bbd8d90   Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (25 commits)
    [POWERPC] Add support for the mpc832x mds board
    [POWERPC] Add initial support for the e300c2 core
    [POWERPC] Add MPC8360EMDS default dts file
    [POWERPC] Add MPC8360EMDS board support
    [POWERPC] Add QUICC Engine (QE) infrastructure
    [POWERPC] Add QE device tree node definition
    [POWERPC] Don't try to just continue if xmon has no input device
    [POWERPC] Fix a printk in pseries_mpic_init_IRQ
    [POWERPC] Get default baud rate in udbg_scc
    [POWERPC] Fix zImage.coff on oldworld PowerMac
    [POWERPC] Fix xmon=off and cleanup xmon initialisation
    [POWERPC] Cleanup include/asm-powerpc/xmon.h
    [POWERPC] Update swim3 printk after blkdev.h change
    [POWERPC] Cell interrupt rework
    POWERPC: mpc82xx merge: board-specific/platform stuff(resend)
    POWERPC: 8272ads merge to powerpc: common stuff
    POWERPC: Added devicetree for mpc8272ads board
    [POWERPC] iSeries has no legacy I/O
    [POWERPC] implement BEGIN/END_FW_FTR_SECTION
    [POWERPC] iSeries does not need pcibios_fixup_resources
    ...

    Linus Torvalds
     
  • d321765f7   [PATCH] Char: serial167, remove useless tty check ... Browse Code »

    serial167, remove useless tty check

    tty is dereferenced before it is checked to be non-NULL. Remove such
    check.

    Signed-off-by: Jiri Slaby
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • b3218a79a   [PATCH] char: kill unneeded memsets ... Browse Code »

    char, another tmp_buf cleanup

    No need to allocate one page as a side buffer. It's no more used. Clean this
    (de)allocs of this useless memory pages in char subtree.

    Signed-off-by: Jiri Slaby
    Acked-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • 08a643681   [PARISC] Add support for Quicksilver AGPGART ... Browse Code »

    Signed-off-by: Kyle McMartin

    Kyle McMartin
     
  • 038b0a6d8   Remove all inclusions of <linux/config.h> ... Browse Code »

    kbuild explicitly includes this at build time.

    Signed-off-by: Dave Jones

    Dave Jones
     
  • c730f5b62   Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work Browse Code »
    Paul Mackerras
     
  • 708e16892   Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
    Add missing maintainer countries in CREDITS
    Fix bytes kilobytes typo in Kconfig for ramdisk
    fix a typo in Documentation/pi-futex.txt
    BUG_ON conversion for fs/xfs/
    BUG_ON() conversion in fs/nfsd/
    BUG_ON conversion for fs/reiserfs
    BUG_ON cleanups in arch/i386
    BUG_ON cleanup in drivers/net/tokenring/
    BUG_ON cleanup for drivers/md/
    kerneldoc-typo in led-class.c
    debugfs: spelling fix
    rcutorture: Fix incorrect description of default for nreaders parameter
    parport: Remove space in function calls
    Michal Wronski: update contact info
    Spelling fix: "control" instead of "cotrol"
    reboot parameter in Documentation/kernel-parameters.txt
    Fix copy&waste bug in comment in scripts/kernel-doc
    remove duplicate "until" from kernel/workqueue.c
    ite_gpio fix tabbage
    fix file specification in comments
    ...

    Fixed trivial path conflicts due to removed files:
    arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c

    Linus Torvalds
     
  • f3c87a899   Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog ... Browse Code »

    * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()

    Linus Torvalds
     
  • c98acc586   ite_gpio fix tabbage ... Browse Code »

    caught some leading spaces in passing.

    Signed-off-by: Adrian Bunk

    Jim Cromie
     
  • f30c22695   fix file specification in comments ... Browse Code »

    Many files include the filename at the beginning, serveral used a wrong one.

    Signed-off-by: Uwe Zeisberger
    Signed-off-by: Adrian Bunk

    Uwe Zeisberger
     
  • f311896a9   [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl() ... Browse Code »

    Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results

    The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands.
    ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead.

    Signed-off-by: Samuel Tardieu
    Signed-off-by: Wim Van Sebroeck
    Acked-by: Alan Cox
    Signed-off-by: Andrew Morton

    Wim Van Sebroeck