Skip to content
  1. Sep 20, 2009
  2. Sep 19, 2009
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of... · 78f28b7c
      Linus Torvalds authored
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
        x86: Move get/set_wallclock to x86_platform_ops
        x86: platform: Fix section annotations
        x86: apic namespace cleanup
        x86: Distangle ioapic and i8259
        x86: Add Moorestown early detection
        x86: Add hardware_subarch ID for Moorestown
        x86: Add early platform detection
        x86: Move tsc_init to late_time_init
        x86: Move tsc_calibration to x86_init_ops
        x86: Replace the now identical time_32/64.c by time.c
        x86: time_32/64.c unify profile_pc
        x86: Move calibrate_cpu to tsc.c
        x86: Make timer setup and global variables the same in time_32/64.c
        x86: Remove mca bus ifdef from timer interrupt
        x86: Simplify timer_ack magic in time_32.c
        x86: Prepare unification of time_32/64.c
        x86: Remove do_timer hook
        x86: Add timer_init to x86_init_ops
        x86: Move percpu clockevents setup to x86_init_ops
        x86: Move xen_post_allocator_init into xen_pagetable_setup_done
        ...
      
      Fix up conflicts in arch/x86/include/asm/io_apic.h
      78f28b7c
    • Geoffrey Thomas's avatar
    • Nelson Elhage's avatar
      frv: clean up linker script using new linker script macros. · 9c88b25b
      Nelson Elhage authored
      
      
      This is largely a straightforward conversion. The patch results in
      fewer output sections, and some data being reordered, but should have
      no functional impact.
      
      Also, note that this patch moves some data (namely, init_task and
      cacheline-aligned) inside [_sdata,_edata].
      
      Because frv already builds using -ffunction-sections -fdata-sections,
      we can't use BSS_SECTION or RW_DATA_SECTION yet, since they do not
      currently include the required .bss.* and .data.* sections.
      
      Signed-off-by: default avatarNelson Elhage <nelhage@ksplice.com>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
      Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9c88b25b
    • Nelson Elhage's avatar
      frv: remove unused .altinstructions code · 88ddb81e
      Nelson Elhage authored
      
      
      It appears that frv copied the .altinstructions definitions in its linker
      script from x86. Since frv doesn't put anything in those sections, this
      is just dead code.
      
      Signed-off-by: default avatarNelson Elhage <nelhage@ksplice.com>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
      Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      88ddb81e
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 3530c188
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (64 commits)
        ext4: Update documentation about quota mount options
        ext4: replace MAX_DEFRAG_SIZE with EXT_MAX_BLOCK
        ext4: Fix the alloc on close after a truncate hueristic
        ext4: Add a tracepoint for ext4_alloc_da_blocks()
        ext4: store EXT4_EXT_MIGRATE in i_state instead of i_flags
        ext4: limit block allocations for indirect-block files to < 2^32
        ext4: Fix different block exchange issue in EXT4_IOC_MOVE_EXT
        ext4: Add null extent check to ext_get_path
        ext4: Replace BUG_ON() with ext4_error() in move_extents.c
        ext4: Replace get_ext_path macro with an inline funciton
        ext4: Fix include/trace/events/ext4.h to work with Systemtap
        ext4: Fix initalization of s_flex_groups
        ext4: Always set dx_node's fake_dirent explicitly.
        ext4: Fix async commit mode to be safe by using a barrier
        ext4: Don't update superblock write time when filesystem is read-only
        ext4: Clarify the locking details in mballoc
        ext4: check for need init flag in ext4_mb_load_buddy
        ext4: move ext4_mb_init_group() function earlier in the mballoc.c
        ext4: Make non-journal fsync work properly
        ext4: Assure that metadata blocks are written during fsync in no journal mode
        ...
      3530c188