11 May, 2007

1 commit

  • Add a separate IRQ stack. This differs from i386 in having the entire
    interrupt run on a separate stack rather than starting on the normal kernel
    stack and switching over once some preparation has been done. The underlying
    mechanism, is of course, sigaltstack.

    Another difference is that interrupts that happen in userspace are handled on
    the normal kernel stack. These cause a wait wakeup instead of a signal
    delivery so there is no point in trying to switch stacks for these. There's
    no other stuff on the stack, so there is no extra stack consumption.

    This quirk makes it possible to have the entire interrupt run on a separate
    stack - process preemption (and calls to schedule()) happens on a normal
    kernel stack. If we enable CONFIG_PREEMPT, this will need to be rethought.

    The IRQ stack for CPU 0 is declared in the same way as the initial kernel
    stack. IRQ stacks for other CPUs will be allocated dynamically.

    An extra field was added to the thread_info structure. When the active
    thread_info is copied to the IRQ stack, the real_thread field points back to
    the original stack. This makes it easy to tell where to copy the thread_info
    struct back to when the interrupt is finished. It also serves as a marker of
    a nested interrupt. It is NULL for the first interrupt on the stack, and
    non-NULL for any nested interrupts.

    Care is taken to behave correctly if a second interrupt comes in when the
    thread_info structure is being set up or taken down. I could just disable
    interrupts here, but I don't feel like giving up any of the performance gained
    by not flipping signals on and off.

    If an interrupt comes in during these critical periods, the handler can't run
    because it has no idea what shape the stack is in. So, it sets a bit for its
    signal in a global mask and returns. The outer handler will deal with this
    signal itself.

    Atomicity is had with xchg. A nested interrupt that needs to bail out will
    xchg its signal mask into pending_mask and repeat in case yet another
    interrupt hit at the same time, until the mask stabilizes.

    The outermost interrupt will set up the thread_info and xchg a zero into
    pending_mask when it is done. At this point, nested interrupts will look at
    ->real_thread and see that no setup needs to be done. They can just continue
    normally.

    Similar care needs to be taken when exiting the outer handler. If another
    interrupt comes in while it is copying the thread_info, it will drop a bit
    into pending_mask. The outer handler will check this and if it is non-zero,
    will loop, set up the stack again, and handle the interrupt.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

10 May, 2007

2 commits

  • With the advent of kdump, the assumption that the boot CPU when booting an UP
    kernel is always the CPU with a particular hardware ID (often 0) (usually
    referred to as BSP on some architectures) is not valid anymore. The reason
    being that the dump capture kernel boots on the crashed CPU (the CPU that
    invoked crash_kexec), which may be or may not be that particular CPU.

    Move definition of hard_smp_processor_id for the UP case to
    architecture-specific code ("asm/smp.h") where it belongs, so that each
    architecture can provide its own implementation.

    Signed-off-by: Fernando Luis Vazquez Cao
    Cc: "Luck, Tony"
    Acked-by: Andi Kleen
    Cc: "Eric W. Biederman"
    Cc: Vivek Goyal
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Fernando Luis Vazquez Cao
     
  • UML now needs required-features.h to build - an empty one suffices.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

09 May, 2007

2 commits

  • i386:

    Rearrange the cmpxchg code to allow atomic.h to get it without needing to
    include system.h. This kills warnings in the UML build from atomic.h about
    implicit declarations of cmpxchg symbols. The i386 build presumably isn't
    seeing this because a separate inclusion of system.h is covering it over.

    The cmpxchg stuff is moved to asm-i386/cmpxchg.h, with an include left in
    system.h for the benefit of generic code which expects cmpxchg there.

    Meanwhile, atomic.h includes cmpxchg.h.

    This causes no noticable damage to the i386 build.

    x86_64:

    Move cmpxchg into its own header. atomic.h already included system.h, so
    this is changed to include cmpxchg.h.

    This is purely cleanup - it's not fixing any warnings - so if the x86_64
    system.h isn't considered as cleanup-worthy as i386, then this can be
    dropped.

    It causes no noticable damage to the x86_64 build.

    uml:

    The i386 and x86_64 cmpxchg patches require an asm-um/cmpxchg.h for the
    UML build.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • This patch moves the die notifier handling to common code. Previous
    various architectures had exactly the same code for it. Note that the new
    code is compiled unconditionally, this should be understood as an appel to
    the other architecture maintainer to implement support for it aswell (aka
    sprinkling a notify_die or two in the proper place)

    arm had a notifiy_die that did something totally different, I renamed it to
    arm_notify_die as part of the patch and made it static to the file it's
    declared and used at. avr32 used to pass slightly less information through
    this interface and I brought it into line with the other architectures.

    [akpm@linux-foundation.org: build fix]
    [akpm@linux-foundation.org: fix vmalloc_sync_all bustage]
    [bryan.wu@analog.com: fix vmalloc_sync_all in nommu]
    Signed-off-by: Christoph Hellwig
    Cc:
    Cc: Russell King
    Signed-off-by: Bryan Wu
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Hellwig
     

08 May, 2007

1 commit

  • More trimming of the page fault path.

    Permissions are passed around in a single int rather than one bit per
    int. The permission values are copied from libc so that they can be
    passed to mmap and mprotect without any further conversion.

    The register sets used by do_syscall_stub and copy_context_skas0 are
    initialized once, at boot time, rather than once per call.

    wait_stub_done checks whether it is getting the signals it expects by
    comparing the wait status to a mask containing bits for the signals of
    interest rather than comparing individually to the signal numbers. It
    also has one check for a wait failure instead of two. The caller is
    expected to do the initial continue of the stub. This gets rid of an
    argument and some logic. The fname argument is gone, as that can be
    had from a stack trace.

    user_signal() is collapsed into userspace() as it is basically one or
    two lines of code afterwards.

    The physical memory remapping stuff is gone, as it is unused.

    flush_tlb_page is inlined.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

03 May, 2007

1 commit

  • Add hooks to allow a paravirt implementation to track the lifetime of
    an mm. Paravirtualization requires three hooks, but only two are
    needed in common code. They are:

    arch_dup_mmap, which is called when a new mmap is created at fork

    arch_exit_mmap, which is called when the last process reference to an
    mm is dropped, which typically happens on exit and exec.

    The third hook is activate_mm, which is called from the arch-specific
    activate_mm() macro/function, and so doesn't need stub versions for
    other architectures. It's called when an mm is first used.

    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Andi Kleen
    Cc: linux-arch@vger.kernel.org
    Cc: James Bottomley
    Acked-by: Ingo Molnar

    Jeremy Fitzhardinge
     

26 Apr, 2007

1 commit


03 Apr, 2007

1 commit

  • Currently we have a confused udelay implementation.

    * __const_udelay does not accept usecs but xloops in i386 and x86_64
    * our implementation requires usecs as arg
    * it gets a xloops count when called by asm/arch/delay.h

    Bugs related to this (extremely long shutdown times) where reported by some
    x86_64 users, especially using Device Mapper.

    To hit this bug, a compile-time constant time parameter must be passed -
    that's why UML seems to work most times. Fix this with a simple udelay
    implementation.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso
    Acked-by: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paolo 'Blaisorblade' Giarrusso
     

31 Mar, 2007

1 commit


29 Mar, 2007

1 commit

  • _PAGE_PROTNONE conflicts with the lowest bit of pgoff. This causes all sorts
    of weirdness when nonlinear mappings are used.

    Took me a good half day to track this down.

    Signed-off-by: Miklos Szeredi
    Signed-off-by: Jeff Dike
    Acked-by: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Miklos Szeredi
     

28 Mar, 2007

1 commit

  • During a static link, ld has started putting a .note section in the
    .uml.setup.init section. This has the result that the UML setups begin
    with 32 bytes of garbage and UML crashes immediately on boot.

    This patch creates a specific .note section for ld to drop this stuff
    into.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

02 Mar, 2007

1 commit

  • Fix the fact that pte_mkread set _PAGE_RW instead of _PAGE_USER (the logic is
    copied from i386 in most place, so it is really as bad as you're thinking).

    Thus currently page tables are more permissive than they should.

    Such a change may trigger other latent bugs, so be careful with this.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

12 Feb, 2007

3 commits

  • This patch fixes some missing ptrace bits on x86_64. PTRACE_ARCH_PRCTL is
    hooked up and implemented. This required generalizing arch_prctl_skas
    slightly to take a task_struct to modify. Previously, it always operated on
    current.

    Reading and writing the debug registers is also enabled by un-ifdefing the
    code that implements that. It turns out that x86_64 is identical to i386, so
    the same code can be used.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • x86_64 needs some TLS fixes. What was missing was remembering the child
    thread id during clone and stuffing it into the child during each context
    switch.

    The %fs value is stored separately in the thread structure since the host
    controls what effect it has on the actual register file. The host also needs
    to store it in its own thread struct, so we need the value kept outside the
    register file.

    arch_prctl_skas was fixed to call PTRACE_ARCH_PRCTL appropriately. There is
    some saving and restoring of registers in the ARCH_SET_* cases so that the
    correct set of registers are changed on the host and restored to the process
    when it runs again.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Fix apparent typo, where CONFIG_64_BIT should read CONFIG_64BIT.

    Signed-off-by: Robert P. J. Day
    Cc: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robert P. J. Day
     

02 Feb, 2007

1 commit


09 Dec, 2006

1 commit

  • The BUG changes in -mm3 need some arch support. This patch adds the UML
    support needed. For the most part, it was stolen from the underlying
    architecture. The exception is the kernel eip < PAGE_OFFSET test, which is
    wrong for skas mode UMLs.

    Signed-off-by: Jeff Dike
    Cc: Jeremy Fitzhardinge
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

08 Dec, 2006

2 commits

  • Pass struct dev pointer to dma_cache_sync()

    dma_cache_sync() is ill-designed in that it does not have a struct device
    pointer argument which makes proper support for systems that consist of a
    mix of coherent and non-coherent DMA devices hard. Change dma_cache_sync
    to take a struct device pointer as first argument and fix all its callers
    to pass it.

    Signed-off-by: Ralf Baechle
    Cc: James Bottomley
    Cc: "David S. Miller"
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     
  • dma_is_consistent() is ill-designed in that it does not have a struct
    device pointer argument which makes proper support for systems that consist
    of a mix of coherent and non-coherent DMA devices hard. Change
    dma_is_consistent to take a struct device pointer as first argument and fix
    the sole caller to pass it.

    Signed-off-by: Ralf Baechle
    Cc: James Bottomley
    Cc: "David S. Miller"
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     

02 Dec, 2006

1 commit

  • Add arch specific dev_archdata to struct device

    Adds an arch specific struct dev_arch to struct device. This enables
    architecture to add specific fields to every device in the system, like
    DMA operation pointers, NUMA node ID, firmware specific data, etc...

    Signed-off-by: Benjamin Herrenschmidt
    Acked-by: Andi Kleen
    Acked-By: David Howells
    Signed-off-by: Greg Kroah-Hartman

    Benjamin Herrenschmidt
     

01 Nov, 2006

1 commit


21 Oct, 2006

1 commit


06 Oct, 2006

1 commit

  • Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5
    "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers".

    Cc: David Howells
    Cc: Jeff Dike
    Cc: Paolo "Blaisorblade" Giarrusso
    Signed-off-by: Pekka Enberg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pekka Enberg
     

02 Oct, 2006

1 commit

  • Some architectures provide an execve function that does not set errno, but
    instead returns the result code directly. Rename these to kernel_execve to
    get the right semantics there. Moreover, there is no reasone for any of these
    architectures to still provide __KERNEL_SYSCALLS__ or _syscallN macros, so
    remove these right away.

    [akpm@osdl.org: build fix]
    [bunk@stusta.de: build fix]
    Signed-off-by: Arnd Bergmann
    Cc: Andi Kleen
    Acked-by: Paul Mackerras
    Cc: Benjamin Herrenschmidt
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Cc: Russell King
    Cc: Ian Molton
    Cc: Mikael Starvik
    Cc: David Howells
    Cc: Yoshinori Sato
    Cc: Hirokazu Takata
    Cc: Ralf Baechle
    Cc: Kyle McMartin
    Cc: Heiko Carstens
    Cc: Martin Schwidefsky
    Cc: Paul Mundt
    Cc: Kazumoto Kojima
    Cc: Richard Curnow
    Cc: William Lee Irwin III
    Cc: "David S. Miller"
    Cc: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Cc: Miles Bader
    Cc: Chris Zankel
    Cc: "Luck, Tony"
    Cc: Geert Uytterhoeven
    Cc: Roman Zippel
    Signed-off-by: Adrian Bunk
    Cc: Arnd Bergmann
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arnd Bergmann
     

30 Sep, 2006

1 commit

  • Andi is making pte_mkexec go away, and UML had one of the last uses.

    This removes the use and the definition.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     

27 Sep, 2006

3 commits

  • fork on UML has always somewhat subtle. The underlying cause has been the
    need to initialize a stack for the new process. The only portable way to
    initialize a new stack is to set it as the alternate signal stack and take a
    signal. The signal handler does whatever initialization is needed and jumps
    back to the original stack, where the fork processing is finished. The basic
    context switching mechanism is a jmp_buf for each process. You switch to a
    new process by longjmping to its jmp_buf.

    Now that UML has its own implementation of setjmp and longjmp, and I can poke
    around inside a jmp_buf without fear that libc will change the structure, a
    much simpler mechanism is possible. The jmpbuf can simply be initialized by
    hand.

    This eliminates -
    the need to set up and remove the alternate signal stack
    sending and handling a signal
    the signal blocking needed around the stack switching, since
    there is no stack switching
    setting up the jmp_buf needed to jump back to the original
    stack after the new one is set up

    In addition, since jmp_buf is now defined by UML, and not by libc, it can be
    embedded in the thread struct. This makes it unnecessary to have it exist on
    the stack, where it used to be. It also simplifies interfaces, since the
    switch jmp_buf used to be a void * inside the thread struct, and functions
    which took it as an argument needed to define a jmp_buf variable and assign it
    from the void *.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • The UML/x86_64 headers were missing ptrace support for some segment registers.
    The underlying problem was that the x86_64 kernel uses user_regs_struct
    rather than the ptrace register definitions in ptrace. This patch switches
    UML/x86_64 to using user_regs_struct for its definitions of the host's
    registers.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (225 commits)
    [PATCH] Don't set calgary iommu as default y
    [PATCH] i386/x86-64: New Intel feature flags
    [PATCH] x86: Add a cumulative thermal throttle event counter.
    [PATCH] i386: Make the jiffies compares use the 64bit safe macros.
    [PATCH] x86: Refactor thermal throttle processing
    [PATCH] Add 64bit jiffies compares (for use with get_jiffies_64)
    [PATCH] Fix unwinder warning in traps.c
    [PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
    [PATCH] x86: Move direct PCI scanning functions out of line
    [PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
    [PATCH] Don't leak NT bit into next task
    [PATCH] i386/x86-64: Work around gcc bug with noreturn functions in unwinder
    [PATCH] Fix some broken white space in ia32_signal.c
    [PATCH] Initialize argument registers for 32bit signal handlers.
    [PATCH] Remove all traces of signal number conversion
    [PATCH] Don't synchronize time reading on single core AMD systems
    [PATCH] Remove outdated comment in x86-64 mmconfig code
    [PATCH] Use string instructions for Core2 copy/clear
    [PATCH] x86: - restore i8259A eoi status on resume
    [PATCH] i386: Split multi-line printk in oops output.
    ...

    Linus Torvalds
     

26 Sep, 2006

4 commits

  • Include the host architecture's ptrace-abi.h instead of ptrace.h.

    There was some cpp mangling of names around the ptrace.h include to avoid
    symbol clashes between UML and the host architecture. Most of these can go
    away. The exception is struct pt_regs, which is convenient to have in
    userspace, but must be renamed in order that UML can define its own.

    ptrace-x86_64.h needed to have some now-obsolete cpp cruft and a declaration
    removed.

    Signed-off-by: Jeff Dike
    Cc: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • The KSTK_* macros used an inordinate amount of stack. In order to overcome
    an impedance mismatch between their interface, which just returns a single
    register value, and the interface of get_thread_regs, which took a full
    pt_regs, the implementation created an on-stack pt_regs, filled it in, and
    returned one field. do_task_stat calls KSTK_* twice, resulting in two
    local pt_regs, blowing out the stack.

    This patch changes the interface (and name) of get_thread_regs to just
    return a single register from a jmp_buf.

    The include of archsetjmp.h" in registers.h to get the definition of
    jmp_buf exposed a bogus include of in start_up.c.
    shouldn't be used anywhere any more since UML uses the klibc
    setjmp/longjmp.

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

    Jeff Dike
     
  • One of the changes necessary for shared page tables is to standardize the
    pxx_page macros. pte_page and pmd_page have always returned the struct
    page associated with their entry, while pte_page_kernel and pmd_page_kernel
    have returned the kernel virtual address. pud_page and pgd_page, on the
    other hand, return the kernel virtual address.

    Shared page tables needs pud_page and pgd_page to return the actual page
    structures. There are very few actual users of these functions, so it is
    simple to standardize their usage.

    Since this is basic cleanup, I am submitting these changes as a standalone
    patch. Per Hugh Dickins' comments about it, I am also changing the
    pxx_page_kernel macros to pxx_page_vaddr to clarify their meaning.

    Signed-off-by: Dave McCracken
    Cc: Hugh Dickins
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dave McCracken
     
  • - Move them to a pure assembly file. Previously they were in
    a C file that only consisted of inline assembly. Doing it in pure
    assembler is much nicer.
    - Add a frame.i include with FRAME/ENDFRAME macros to easily
    add frame pointers to assembly functions
    - Add dwarf2 annotation to them so that the new dwarf2 unwinder
    doesn't get stuck on them
    - Random cleanups

    Includes feedback from Jan Beulich and a UML build fix from Andrew
    Morton.

    Cc: jbeulich@novell.com
    Cc: jdike@addtoit.com
    Signed-off-by: Andi Kleen

    Andi Kleen
     

21 Sep, 2006

1 commit


05 Jul, 2006

1 commit

  • * git://git.infradead.org/hdrinstall-2.6:
    Remove export of include/linux/isdn/tpam.h
    Remove and from userspace export
    Restrict headers exported to userspace for SPARC and SPARC64
    Add empty Kbuild files for 'make headers_install' in remaining arches.
    Add Kbuild file for Alpha 'make headers_install'
    Add Kbuild file for SPARC 'make headers_install'
    Add Kbuild file for IA64 'make headers_install'
    Add Kbuild file for S390 'make headers_install'
    Add Kbuild file for i386 'make headers_install'
    Add Kbuild file for x86_64 'make headers_install'
    Add Kbuild file for PowerPC 'make headers_install'
    Add generic Kbuild files for 'make headers_install'
    Basic implementation of 'make headers_check'
    Basic implementation of 'make headers_install'

    Linus Torvalds
     

02 Jul, 2006

1 commit

  • Make __copy_*_user_inatomic really atomic to avoid "Sleeping function called in
    atomic context" warnings, especially from futex code.

    This is made by adding another kmap_atomic slot and making copy_*_user_skas
    use kmap_atomic; also copy_*_user() becomes atomic, but that's true and is not
    a problem for i386 (and we can always add might_sleep there as done
    elsewhere). For TT mode kmap is not used, so there's no need for this.

    I've had to use another slot since both KM_USER0 and KM_USER1 are used
    elsewhere and could cause conflicts. Till now we reused the kmap_atomic slot
    list from the subarch, but that's not needed as that list must contain the
    common ones (used by generic code) + the ones used in architecture specific
    code (and Uml till now used none); so I've taken the i386 one after comparing
    it with ones from other archs, and added KM_UML_USERCOPY.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso
    Cc: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paolo 'Blaisorblade' Giarrusso
     

01 Jul, 2006

1 commit


30 Jun, 2006

1 commit


21 Jun, 2006

1 commit

  • * git://git.infradead.org/hdrcleanup-2.6: (63 commits)
    [S390] __FD_foo definitions.
    Switch to __s32 types in joystick.h instead of C99 types for consistency.
    Add to headers included for userspace in
    Move inclusion of out of user scope in asm-x86_64/mtrr.h
    Remove struct fddi_statistics from user view in
    Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
    Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
    Include and use __uXX types in
    Use __uXX types in , include too
    Remove private struct dx_hash_info from public view in
    Include and use __uXX types in
    Use __uXX types in for struct divert_blk et al.
    Use __u32 for elf_addr_t in , not u32. It's user-visible.
    Remove PPP_FCS from user view in , remove __P mess entirely
    Use __uXX types in user-visible structures in
    Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
    Use __uXX types for S390 DASD volume label definitions which are user-visible
    S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
    Remove unneeded inclusion of from
    Fix private integer types used in V4L2 ioctls.
    ...

    Manually resolve conflict in include/linux/mtd/physmap.h

    Linus Torvalds
     

18 Jun, 2006

1 commit