Skip to content
  1. Apr 03, 2009
    • Pekka Enberg's avatar
      kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_inflate.c · 079effb6
      Pekka Enberg authored
      
      
      Impact: fix build
      
      lib/decompress_inflate.c depends on slab.h without including it:
      
          CC      lib/decompress_inflate.o
        lib/decompress_inflate.c: In function ‘gunzip’:
        lib/decompress_inflate.c:45: error: implicit declaration of function ‘kmalloc’
        lib/decompress_inflate.c:45: warning: assignment makes pointer from integer without a cast
        lib/decompress_inflate.c:57: warning: assignment makes pointer from integer without a cast
        lib/decompress_inflate.c:65: warning: assignment makes pointer from integer without a cast
        lib/decompress_inflate.c:71: warning: assignment makes pointer from integer without a cast
        lib/decompress_inflate.c:154: error: implicit declaration of function ‘kfree’
        make[1]: *** [lib/decompress_inflate.o] Error 1
        make: *** [lib/] Error 2
      
      It gets included implicitly currently - but this will not be the
      case with upcoming kmemtrace changes.
      
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      LKML-Reference: <1237886030.25315.47.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      079effb6
    • Pekka Enberg's avatar
      kmemtrace, squashfs: fix slab.h dependency problem in squasfs · 23516dc7
      Pekka Enberg authored
      
      
      Impact: cleanup
      
      fs/squashfs/export.c depends on slab.h without including it:
      
          CC      fs/squashfs/export.o
        fs/squashfs/export.c: In function ‘squashfs_read_inode_lookup_table’:
        fs/squashfs/export.c:133: error: implicit declaration of function ‘kmalloc’
        fs/squashfs/export.c:133: warning: assignment makes pointer from integer without a cast
        fs/squashfs/export.c:143: error: implicit declaration of function ‘kfree’
        make[1]: *** [fs/squashfs/export.o] Error 1
        make: *** [fs/squashfs/] Error 2
      
      It gets included implicitly currently - but this will not be the
      case with upcoming kmemtrace changes.
      
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      LKML-Reference: <1237884999.25315.41.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      23516dc7
    • Pekka Enberg's avatar
      kmemtrace, befs: fix slab.h dependency problem · c325962b
      Pekka Enberg authored
      
      
      Impact: cleanup
      
      fs/befs/debug.c depends on slab.h without including it. Upcoming
      changes for kmemtrace would break the build:
      
          CC      fs/befs/debug.o
        fs/befs/debug.c: In function ‘befs_error’:
        fs/befs/debug.c:31: error: implicit declaration of function ‘kmalloc’
        fs/befs/debug.c:31: warning: initialization makes pointer from integer without a cast
        fs/befs/debug.c:42: error: implicit declaration of function ‘kfree’
        fs/befs/debug.c: In function ‘befs_warning’:
        fs/befs/debug.c:49: warning: initialization makes pointer from integer without a cast
        fs/befs/debug.c: In function ‘befs_debug’:
        fs/befs/debug.c:73: warning: assignment makes pointer from integer without a cast
        make[1]: *** [fs/befs/debug.o] Error 1
        make: *** [fs/befs/] Error 2
      
      So add the dependency explicitly.
      
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      LKML-Reference: <1237884230.25315.33.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      c325962b
    • Pekka Enberg's avatar
      kmemtrace, security: fix linux/key.h header file dependencies · aa84442d
      Pekka Enberg authored
      
      
      Impact: cleanup
      
      We want to remove percpu.h from rcupdate.h (for upcoming kmemtrace
      changes), but this is not possible currently without breaking the
      build because key.h has an implicit include file dependency on
      rwsem.h:
      
          CC [M]  fs/cifs/cifs_spnego.o
        In file included from include/keys/user-type.h:15,
                         from fs/cifs/cifs_spnego.c:24:
        include/linux/key.h:128: error: field ‘sem’ has incomplete type
        make[2]: *** [fs/cifs/cifs_spnego.o] Error 1
        make[1]: *** [fs/cifs] Error 2
        make: *** [fs] Error 2
      
      Fix it by making the dependency explicit.
      
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      LKML-Reference: <1237884886.25315.39.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      aa84442d
    • Ingo Molnar's avatar
      kmemtrace, fs: fix linux/fdtable.h header file dependencies · 21e54459
      Ingo Molnar authored
      
      
      Impact: cleanup
      
      We want to remove percpu.h from rcupdate.h (for upcoming kmemtrace
      changes), but this is not possible currently without breaking the
      build because fdtable.h has an implicit include file dependency: it
      uses __init does not include init.h.
      
      This can cause build failures on non-x86 architectures:
      
       /home/mingo/tip/include/linux/fdtable.h:66: error: expected '=', ',',
       ';', 'asm' or '__attribute__' before 'files_defer_init'
       make[2]: *** [fs/locks.o] Error 1
      
      We got this header included indirectly via rcupdate.h's percpu.h
      inclusion - but if that is not there the build will break.
      
      Fix it.
      
      Cc: Pekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      Cc: paulmck@linux.vnet.ibm.com
      LKML-Reference: <1237898630.25315.83.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      21e54459
    • Ingo Molnar's avatar
      kmemtrace, fs: uninline simple_transaction_set() · 76791ab2
      Ingo Molnar authored
      
      
      Impact: cleanup
      
      We want to remove percpu.h from rcupdate.h (for upcoming kmemtrace
      changes), but this is not possible currently without breaking the
      build because fs.h has an implicit include file depedency: it
      uses PAGE_SIZE but does not include asm/page.h which defines it.
      
      This problem gets masked in practice because most fs.h using sites
      use rcupreempt.h (and other headers) which includes percpu.h which
      brings in asm/page.h indirectly.
      
      We cannot add asm/page.h to asm/fs.h because page.h is not an
      exported header.
      
      Move simple_transaction_set() to the other simple-transaction
      file helpers in fs/libfs.c.
      
      This removes the include file hell and also reduces
      kernel size a bit.
      
      Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Cc: Pekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      Cc: paulmck@linux.vnet.ibm.com
      LKML-Reference: <1237898630.25315.83.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      76791ab2
    • Pekka Enberg's avatar
      kmemtrace, fs, security: move alloc_secdata() and free_secdata() to linux/security.h · 3d544f41
      Pekka Enberg authored
      
      
      Impact: cleanup
      
      We want to remove percpu.h from rcupdate.h (for upcoming kmemtrace
      changes), but this is not possible currently without breaking the
      build because fs.h has implicit include file depedencies: it uses
      GFP_* types in inlines but does not include gfp.h.
      
      In practice most fs.h using .c files get gfp.h included implicitly,
      via an indirect route: via rcupdate.h inclusion - so this underlying
      problem gets masked in practice.
      
      So we want to solve fs.h's dependency on gfp.h.
      
      gfp.h can not be included here directly because it is not exported and it
      would break the build the following way:
      
        /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
        /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported
        make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1
        make[2]: *** [linux] Error 2
      
      As suggested by Alexey Dobriyan, move alloc_secdata() and free_secdata()
      to linux/security.h - they belong there. This also cleans fs.h of GFP_*
      usage.
      
      Suggested-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
      LKML-Reference: <1237906803.25315.96.camel@penberg-laptop>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      3d544f41
  2. Apr 02, 2009
    • Stephen Rothwell's avatar
      tracing, net: fix net tree and tracing tree merge interaction · 645dae96
      Stephen Rothwell authored
      
      
      Today's linux-next build (powerpc ppc64_defconfig) failed like this:
      
       In file included from net/core/skbuff.c:69:
       include/trace/skb.h:4: error: expected ')' before '(' token
       include/trace/skb.h:4: error: expected ')' before '(' token
       [...]
      
      Caused by commit 2939b046 ("tracing:
      replace TP<var> with TP_<var>") from the tracing tree interacting with
      commit 4893d39e ("Network Drop Monitor:
      Add trace declaration for skb frees") from the net tree.
      
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      645dae96
    • Stephen Rothwell's avatar
      tracing, powerpc: fix powerpc tree and tracing tree interaction · a095bdbb
      Stephen Rothwell authored
      
      
      Today's linux-next build (powerpc allyesconfig) failed like this:
      
      arch/powerpc/kernel/ftrace.c: In function 'prepare_ftrace_return':
      arch/powerpc/kernel/ftrace.c:612: warning: passing argument 3 of 'ftrace_push_return_trace' makes pointer from integer without a cast
      arch/powerpc/kernel/ftrace.c:612: error: too many arguments to function 'ftrace_push_return_trace'
      
      Caused by commit 5d1a03dc
      ("function-graph: moved the timestamp from arch to generic code") from
      the tracing tree which (removed an argument from
      ftrace_push_return_trace()) interacting with commit
      6794c782 ("powerpc64: port of the
      function graph tracer") from the powerpc tree.
      
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Steven Rostedt <srostedt@redhat.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: <linuxppc-dev@ozlabs.org>
      LKML-Reference: <20090327230834.93d0221d.sfr@canb.auug.org.au>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      a095bdbb
    • Ingo Molnar's avatar
      Merge branch 'tracing/core-v2' into tracing-for-linus · 8302294f
      Ingo Molnar authored
      Conflicts:
      	include/linux/slub_def.h
      	lib/Kconfig.debug
      	mm/slob.c
      	mm/slub.c
      8302294f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 4fe70410
      Linus Torvalds authored
      * 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (58 commits)
        SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a port
        NSM: Fix unaligned accesses in nsm_init_private()
        NFS: Simplify logic to compare socket addresses in client.c
        NFS: Start PF_INET6 callback listener only if IPv6 support is available
        lockd: Start PF_INET6 listener only if IPv6 support is available
        SUNRPC: Remove CONFIG_SUNRPC_REGISTER_V4
        SUNRPC: rpcb_register() should handle errors silently
        SUNRPC: Simplify kernel RPC service registration
        SUNRPC: Simplify svc_unregister()
        SUNRPC: Allow callers to pass rpcb_v4_register a NULL address
        SUNRPC: rpcbind actually interprets r_owner string
        SUNRPC: Clean up address type casts in rpcb_v4_register()
        SUNRPC: Don't return EPROTONOSUPPORT in svc_register()'s helpers
        SUNRPC: Use IPv4 loopback for registering AF_INET6 kernel RPC services
        SUNRPC: Set IPV6ONLY flag on PF_INET6 RPC listener sockets
        NFS: Revert creation of IPv6 listeners for lockd and NFSv4 callbacks
        SUNRPC: Remove @family argument from svc_create() and svc_create_pooled()
        SUNRPC: Change svc_create_xprt() to take a @family argument
        SUNRPC: svc_setup_socket() gets protocol family from socket
        SUNRPC: Pass a family argument to svc_register()
        ...
      4fe70410
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 395d7341
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (33 commits)
        ext4: Regularize mount options
        ext4: fix locking typo in mballoc which could cause soft lockup hangs
        ext4: fix typo which causes a memory leak on error path
        jbd2: Update locking coments
        ext4: Rename pa_linear to pa_type
        ext4: add checks of block references for non-extent inodes
        ext4: Check for an valid i_mode when reading the inode from disk
        ext4: Use WRITE_SYNC for commits which are caused by fsync()
        ext4: Add auto_da_alloc mount option
        ext4: Use struct flex_groups to calculate get_orlov_stats()
        ext4: Use atomic_t's in struct flex_groups
        ext4: remove /proc tuning knobs
        ext4: Add sysfs support
        ext4: Track lifetime disk writes
        ext4: Fix discard of inode prealloc space with delayed allocation.
        ext4: Automatically allocate delay allocated blocks on rename
        ext4: Automatically allocate delay allocated blocks on close
        ext4: add EXT4_IOC_ALLOC_DA_BLKS ioctl
        ext4: Simplify delalloc code by removing mpage_da_writepages()
        ext4: Save stack space by removing fake buffer heads
        ...
      395d7341
    • Trond Myklebust's avatar
      Merge branch 'devel' into for-linus · cc859061
      Trond Myklebust authored
      cc859061
    • Trond Myklebust's avatar
      SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a port · c69da774
      Trond Myklebust authored
      
      
      Also ensure that we use the protocol family instead of the address
      family when calling sock_create_kern().
      
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      c69da774
    • Mans Rullgard's avatar
      NSM: Fix unaligned accesses in nsm_init_private() · ad5b365c
      Mans Rullgard authored
      
      
      This fixes unaligned accesses in nsm_init_private() when
      creating nlm_reboot keys.
      
      Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
      Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      ad5b365c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · c226fd65
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: try to free metadata pages when we free btree blocks
        Btrfs: add extra flushing for renames and truncates
        Btrfs: make sure btrfs_update_delayed_ref doesn't increase ref_mod
        Btrfs: optimize fsyncs on old files
        Btrfs: tree logging unlink/rename fixes
        Btrfs: Make sure i_nlink doesn't hit zero too soon during log replay
        Btrfs: limit balancing work while flushing delayed refs
        Btrfs: readahead checksums during btrfs_finish_ordered_io
        Btrfs: leave btree locks spinning more often
        Btrfs: Only let very young transactions grow during commit
        Btrfs: Check for a blocking lock before taking the spin
        Btrfs: reduce stack in cow_file_range
        Btrfs: reduce stalls during transaction commit
        Btrfs: process the delayed reference queue in clusters
        Btrfs: try to cleanup delayed refs while freeing extents
        Btrfs: reduce stack usage in some crucial tree balancing functions
        Btrfs: do extent allocation and reference count updates in the background
        Btrfs: don't preallocate metadata blocks during btrfs_search_slot
      c226fd65
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · c09bca78
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (59 commits)
        ide-floppy: do not complete rq's prematurely
        ide: be able to build pmac driver without IDE built-in
        ide-pmac: IDE cable detection on Apple PowerBook
        ide: inline SELECT_DRIVE()
        ide: turn selectproc() method into dev_select() method (take 5)
        MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
        ide: move data register access out of tf_{read|load}() methods (take 2)
        ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
        ide-io-std: shorten ide_{in|out}put_data()
        ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
        ide: turn set_irq() method into write_devctl() method
        ide: use ATA_HOB
        ide-disk: use ATA_ERR
        ide: add support for CFA specified transfer modes (take 3)
        ide-iops: only clear DMA words on setting DMA mode
        ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
        au1xxx-ide: auide_{in|out}sw() should be static
        ide-floppy: use ide_pio_bytes()
        ide-{floppy,tape}: fix padding for PIO transfers
        ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option
        ...
      c09bca78
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · e76e5b2c
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (88 commits)
        PCI: fix HT MSI mapping fix
        PCI: don't enable too much HT MSI mapping
        x86/PCI: make pci=lastbus=255 work when acpi is on
        PCI: save and restore PCIe 2.0 registers
        PCI: update fakephp for bus_id removal
        PCI: fix kernel oops on bridge removal
        PCI: fix conflict between SR-IOV and config space sizing
        powerpc/PCI: include pci.h in powerpc MSI implementation
        PCI Hotplug: schedule fakephp for feature removal
        PCI Hotplug: rename legacy_fakephp to fakephp
        PCI Hotplug: restore fakephp interface with complete reimplementation
        PCI: Introduce /sys/bus/pci/devices/.../rescan
        PCI: Introduce /sys/bus/pci/devices/.../remove
        PCI: Introduce /sys/bus/pci/rescan
        PCI: Introduce pci_rescan_bus()
        PCI: do not enable bridges more than once
        PCI: do not initialize bridges more than once
        PCI: always scan child buses
        PCI: pci_scan_slot() returns newly found devices
        PCI: don't scan existing devices
        ...
      
      Fix trivial append-only conflict in Documentation/feature-removal-schedule.txt
      e76e5b2c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 32527bc0
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] cio: online_store - trigger recognition for boxed devices
        [S390] cio: disallow online setting of device in transient state
        [S390] cio: introduce notifier for boxed state
        [S390] cio: introduce ccw_device_schedule_sch_unregister
        [S390] cio: wake up on failed recognition
        [S390] fix hypfs build failure
        [PATCH] sysrq: include interrupt.h instead of irq.h
      32527bc0
  3. Apr 01, 2009