1. 21 May, 2011 3 commits
  2. 20 May, 2011 37 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 557eed60
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: Power off empty ports
        libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
        ATA: Don't powerdown Compaq Triflex IDE device on suspend
        libata: Use Maximum Write Same Length to report discard size limit
        drivers/ata/acard-ahci.c: fix enum warning
        pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
        libata-sff: prevent irq descriptions for dummy ports
        pata_cm64x: fix boot crash on parisc
      557eed60
    • Kevin Cernekee's avatar
      ipc: Add missing sys_ni entries for ipc/compat.c functions · be84bfcc
      Kevin Cernekee authored
      When building with:
      
        CONFIG_64BIT=y
        CONFIG_MIPS32_COMPAT=y
        CONFIG_COMPAT=y
        CONFIG_MIPS32_O32=y
        CONFIG_MIPS32_N32=y
        CONFIG_SYSVIPC is not set
        (and implicitly: CONFIG_SYSVIPC_COMPAT is not set)
      
      the final link fails with unresolved symbols for:
      
        compat_sys_semctl, compat_sys_msgsnd, compat_sys_msgrcv,
        compat_sys_shmctl, compat_sys_msgctl, compat_sys_semtimedop
      
      The fix is to add cond_syscall declarations for all syscalls in
      ipc/compat.c
      Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
      Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      be84bfcc
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 06f4e926
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
        macvlan: fix panic if lowerdev in a bond
        tg3: Add braces around 5906 workaround.
        tg3: Fix NETIF_F_LOOPBACK error
        macvlan: remove one synchronize_rcu() call
        networking: NET_CLS_ROUTE4 depends on INET
        irda: Fix error propagation in ircomm_lmp_connect_response()
        irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
        irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
        rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
        be2net: Kill set but unused variable 'req' in lancer_fw_download()
        irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
        atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
        rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
        rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
        rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
        rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
        pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
        isdn: capi: Use pr_debug() instead of ifdefs.
        tg3: Update version to 3.119
        tg3: Apply rx_discards fix to 5719/5720
        ...
      
      Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
      as per Davem.
      06f4e926
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 8e7bfcba
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] define "_sdata" symbol
        pstore: Fix Kconfig dependencies for apei->pstore
        pstore: fix potential logic issue in pstore read interface
        pstore: fix pstore filesystem mount/remount issue
        pstore: fix one type of return value in pstore
        [IA64] fix build warning in arch/ia64/oprofile/backtrace.c
      8e7bfcba
    • Linus Torvalds's avatar
      Merge branch 'timers-fixes-for-linus' of... · 102dc1ba
      Linus Torvalds authored
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        MAINTAINERS: Add drivers/clocksource to TIMEKEEPING
        clockevents/source: Use u64 to make 32bit happy
      102dc1ba
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 91444f47
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (32 commits)
        [CIFS] Fix to problem with getattr caused by invalidate simplification patch
        [CIFS] Remove sparse warning
        [CIFS] Update cifs to version 1.72
        cifs: Change key name to cifs.idmap, misc. clean-up
        cifs: Unconditionally copy mount options to superblock info
        cifs: Use kstrndup for cifs_sb->mountdata
        cifs: Simplify handling of submount options in cifs_mount.
        cifs: cifs_parse_mount_options: do not tokenize mount options in-place
        cifs: Add support for mounting Windows 2008 DFS shares
        cifs: Extract DFS referral expansion logic to separate function
        cifs: turn BCC into a static inlined function
        cifs: keep BCC in little-endian format
        cifs: fix some unused variable warnings in id_rb_search
        CIFS: Simplify invalidate part (try #5)
        CIFS: directio read/write cleanups
        consistently use smb_buf_length as be32 for cifs (try 3)
        cifs: Invoke id mapping functions (try #17 repost)
        cifs: Add idmap key and related data structures and functions (try #17 repost)
        CIFS: Add launder_page operation (try #3)
        Introduce smb2 mounts as vers=2
        ...
      91444f47
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of... · bc091c93
      Linus Torvalds authored
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        extable, core_kernel_data(): Make sure all archs define _sdata
        core_kernel_data(): Fix architectures that do not define _sdata
      bc091c93
    • Linus Torvalds's avatar
      Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 3ed4c058
      Linus Torvalds authored
      * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)
        signal: trivial, fix the "timespec declared inside parameter list" warning
        job control: reorganize wait_task_stopped()
        ptrace: fix signal->wait_chldexit usage in task_clear_group_stop_trapping()
        signal: sys_sigprocmask() needs retarget_shared_pending()
        signal: cleanup sys_sigprocmask()
        signal: rename signandsets() to sigandnsets()
        signal: do_sigtimedwait() needs retarget_shared_pending()
        signal: introduce do_sigtimedwait() to factor out compat/native code
        signal: sys_rt_sigtimedwait: simplify the timeout logic
        signal: cleanup sys_rt_sigprocmask()
        x86: signal: sys_rt_sigreturn() should use set_current_blocked()
        x86: signal: handle_signal() should use set_current_blocked()
        signal: sigprocmask() should do retarget_shared_pending()
        signal: sigprocmask: narrow the scope of ->siglock
        signal: retarget_shared_pending: optimize while_each_thread() loop
        signal: retarget_shared_pending: consider shared/unblocked signals only
        signal: introduce retarget_shared_pending()
        ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/
        signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED
        signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()
        ...
      3ed4c058
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ad947175
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (110 commits)
        [SCSI] qla2xxx: Refactor call to qla2xxx_read_sfp for thermal temperature.
        [SCSI] qla2xxx: Unify the read/write sfp mailbox command routines.
        [SCSI] qla2xxx: Clear complete initialization control block.
        [SCSI] qla2xxx: Allow an override of the registered maximum LUN.
        [SCSI] qla2xxx: Add host number in reset and quiescent message logs.
        [SCSI] qla2xxx: Correctly read sfp single byte mailbox register.
        [SCSI] qla2xxx: Add qla82xx_rom_unlock() function.
        [SCSI] qla2xxx: Log if qla82xx firmware fails to load from flash.
        [SCSI] qla2xxx: Use passed in host to initialize local scsi_qla_host in queuecommand function
        [SCSI] qla2xxx: Correct buffer start in edc sysfs debug print.
        [SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.
        [SCSI] qla2xxx: Fix hang during driver unload when vport is active.
        [SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6.
        [SCSI] qla2xxx: Fix virtual port failing to login after chip reset.
        [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.
        [SCSI] hpsa: Change memset using sizeof(ptr) to sizeof(*ptr)
        [SCSI] ipr: Rate limit DMA mapping errors
        [SCSI] hpsa: add P2000 to list of shared SAS devices
        [SCSI] hpsa: do not attempt PCI power management reset method if we know it won't work.
        [SCSI] hpsa: remove superfluous sleeps around reset code
        ...
      ad947175
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 6c1b8d94
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (32 commits)
        GFS2: Move all locking inside the inode creation function
        GFS2: Clean up symlink creation
        GFS2: Clean up mkdir
        GFS2: Use UUID field in generic superblock
        GFS2: Rename ops_inode.c to inode.c
        GFS2: Inode.c is empty now, remove it
        GFS2: Move final part of inode.c into super.c
        GFS2: Move most of the remaining inode.c into ops_inode.c
        GFS2: Move gfs2_refresh_inode() and friends into glops.c
        GFS2: Remove gfs2_dinode_print() function
        GFS2: When adding a new dir entry, inc link count if it is a subdir
        GFS2: Make gfs2_dir_del update link count when required
        GFS2: Don't use gfs2_change_nlink in link syscall
        GFS2: Don't use a try lock when promoting to a higher mode
        GFS2: Double check link count under glock
        GFS2: Improve bug trap code in ->releasepage()
        GFS2: Fix ail list traversal
        GFS2: make sure fallocate bytes is a multiple of blksize
        GFS2: Add an AIL writeback tracepoint
        GFS2: Make writeback more responsive to system conditions
        ...
      6c1b8d94
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 82aff107
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
        powerpc: Fix hard CPU IDs detection
        powerpc/pmac: Update via-pmu to new syscore_ops
        powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
        powerpc/kvm: Fix kvmppc_core_pending_dec
        powerpc: Remove last piece of GEMINI
        powerpc: Fix for Pegasos keyboard and mouse
        powerpc: Make early memory scan more resilient to out of order nodes
        powerpc/pseries/iommu: Cleanup ddw naming
        powerpc/pseries/iommu: Find windows after kexec during boot
        powerpc/pseries/iommu: Remove ddw property when destroying window
        powerpc/pseries/iommu: Add additional checks when changing iommu mask
        powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
        powerpc: Remove unused/obsolete CONFIG_XICS
        misc: Add CARMA DATA-FPGA Programmer support
        misc: Add CARMA DATA-FPGA Access Driver
        powerpc: Make IRQ_NOREQUEST last to clear, first to set
        powerpc: Integrated Flash controller device tree bindings
        powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
        powerpc/85xx: Fix PCIe IDSEL for Px020RDB
        powerpc/85xx: P2020 DTS: re-organize dts files
        ...
      82aff107
    • Stephen Rothwell's avatar
      spinlock_up.h: include asm/processor.h in for cpu_relax · d974d905
      Stephen Rothwell authored
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h and this was a
      path to including asm/processor.h.  We need to include it excplicitly
      now.
      
      Fixes this build error on sparc32 (at least):
      
        In file included from include/linux/seqlock.h:29,
                         from include/linux/time.h:8,
                         from include/linux/timex.h:56,
                         from include/linux/sched.h:57,
                         from arch/sparc/kernel/asm-offsets.c:13:
        include/linux/spinlock.h: In function 'spin_unlock_wait':
        include/linux/spinlock.h:360: error: implicit declaration of function 'cpu_relax
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d974d905
    • Linus Torvalds's avatar
      sanitize <linux/prefetch.h> usage · 268bb0ce
      Linus Torvalds authored
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h, which
      uncovered several cases that had apparently relied on that rather
      obscure header file dependency.
      
      So this fixes things up a bit, using
      
         grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
         grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')
      
      to guide us in finding files that either need <linux/prefetch.h>
      inclusion, or have it despite not needing it.
      
      There are more of them around (mostly network drivers), but this gets
      many core ones.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      268bb0ce
    • Eric Dumazet's avatar
      macvlan: fix panic if lowerdev in a bond · d9351561
      Eric Dumazet authored
      commit a35e2c1b (macvlan: use rx_handler_data pointer to store
      macvlan_port pointer V2) added a bug in macvlan_port_create()
      
      Steps to reproduce the bug:
      
      # ifenslave bond0 eth0 eth1
      
      # ip link add link eth0 up name eth0#1 type macvlan
      ->error EBUSY
      
      # ip link add link eth0 up name eth0#1 type macvlan
      ->panic
      
      
      Fix: Dont set IFF_MACVLAN_PORT in error case.
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d9351561
    • Tony Luck's avatar
      [IA64] define "_sdata" symbol · 30f7276c
      Tony Luck authored
      core_kernel_data() wants to know if an address looks like kernel
      data. IA64 has had _edata forever, but never needed _sdata until
      now.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      30f7276c
    • Tony Luck's avatar
      Pull misc-2.6.40 into release branch · 5e4de22b
      Tony Luck authored
      5e4de22b
    • Tony Luck's avatar
      Pull pstore into release branch · 3935bb94
      Tony Luck authored
      3935bb94
    • Luck, Tony's avatar
      pstore: Fix Kconfig dependencies for apei->pstore · 5d2a8342
      Luck, Tony authored
      Geert Uytterhoeven ran a dependency checker which kicked out this warning:
      
      + warning: (ACPI_APEI) selects PSTORE which has unmet direct dependencies (MISC_FILESYSTEMS):  => N/A
      
      Randy confirmed that the fix was to "select MISC_FILESYSTEMS" too.
      Tested-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      5d2a8342
    • Steve French's avatar
      [CIFS] Fix to problem with getattr caused by invalidate simplification patch · 156ecb2d
      Steve French authored
      Fix to earlier "Simplify invalidate part (try #6)" patch
      That patch caused problems with connectathon test 5.
      Reviewed-by: default avatarJeff Layton <jlayton@samba.org>
      Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      156ecb2d
    • Thomas Gleixner's avatar
      MAINTAINERS: Add drivers/clocksource to TIMEKEEPING · bbe7b8be
      Thomas Gleixner authored
      It's not a random dump ground and we care about it.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      bbe7b8be
    • Thomas Gleixner's avatar
      clockevents/source: Use u64 to make 32bit happy · c0e299b1
      Thomas Gleixner authored
      unsigned long is not 64bit on 32bit machine.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      c0e299b1
    • Benjamin Herrenschmidt's avatar
      powerpc: Fix hard CPU IDs detection · 208b3a4c
      Benjamin Herrenschmidt authored
      commit 9d07bc84
      "powerpc: Properly handshake CPUs going out of boot spin loop"
      
      Would cause a miscalculation of the hard CPU ID. It removes breaking
      out of the loop when finding a match with a processor, thus the "i"
      used as an index in the intserv array is always incorrect
      
      This broke interrupt on my PowerMac laptop.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      208b3a4c
    • Steven Rostedt's avatar
      extable, core_kernel_data(): Make sure all archs define _sdata · a2d063ac
      Steven Rostedt authored
      A new utility function (core_kernel_data()) is used to determine if a
      passed in address is part of core kernel data or not. It may or may not
      return true for RO data, but this utility must work for RW data.
      
      Thus both _sdata and _edata must be defined and continuous,
      without .init sections that may later be freed and replaced by
      volatile memory (memory that can be freed).
      
      This utility function is used to determine if data is safe from
      ever being freed. Thus it should return true for all RW global
      data that is not in a module or has been allocated, or false
      otherwise.
      
      Also change core_kernel_data() back to the more precise _sdata condition
      and document the function.
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Acked-by: default avatarHirokazu Takata <takata@linux-m32r.org>
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: linux-m68k@lists.linux-m68k.org
      Cc: Kyle McMartin <kyle@mcmartin.ca>
      Cc: Helge Deller <deller@gmx.de>
      Cc: JamesE.J.Bottomley <jejb@parisc-linux.org>
      Link: http://lkml.kernel.org/r/1305855298.1465.19.camel@gandalf.stny.rr.comSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
      ----
       arch/alpha/kernel/vmlinux.lds.S   |    1 +
       arch/m32r/kernel/vmlinux.lds.S    |    1 +
       arch/m68k/kernel/vmlinux-std.lds  |    2 ++
       arch/m68k/kernel/vmlinux-sun3.lds |    1 +
       arch/mips/kernel/vmlinux.lds.S    |    1 +
       arch/parisc/kernel/vmlinux.lds.S  |    3 +++
       kernel/extable.c                  |   12 +++++++++++-
       7 files changed, 20 insertions(+), 1 deletion(-)
      a2d063ac
    • Ingo Molnar's avatar
      Merge branch 'perf/core' into perf/urgent · c16dbd54
      Ingo Molnar authored
      Merge reason: One pending commit was left in perf/core after Linus merged
                    perf/core - continue v2.6.40 work in the perf/urgent reason.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      c16dbd54
    • Benjamin Herrenschmidt's avatar
      powerpc/pmac: Update via-pmu to new syscore_ops · e83b906c
      Benjamin Herrenschmidt authored
      This was left as a sysdev, breaking the build
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e83b906c
    • Benjamin Herrenschmidt's avatar
      Merge remote branch 'origin/master' into merge · 880102e7
      Benjamin Herrenschmidt authored
      Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
      call to arch/powerpc/platforms/cell/interrupt.c
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      880102e7
    • Matt Carlson's avatar
      tg3: Add braces around 5906 workaround. · 7196cd6c
      Matt Carlson authored
      Commit dabc5c67, entitled
      "tg3: Move TSO_CAPABLE assignment", moved some TSO flagging code around.
      In the process it failed to add braces around an exceptional 5906
      condition.  This patch fixes the problem.
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7196cd6c
    • Matt Carlson's avatar
      tg3: Fix NETIF_F_LOOPBACK error · d542fe27
      Matt Carlson authored
      Mahesh Bandewar noticed that the features cleanup in commit
      0da0606f, entitled
      "tg3: Consolidate all netdev feature assignments", mistakenly sets
      NETIF_F_LOOPBACK by default.  This patch corrects the error.
      Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d542fe27
    • Eric Dumazet's avatar
      macvlan: remove one synchronize_rcu() call · 449f4544
      Eric Dumazet authored
      When one macvlan device is dismantled, we can avoid one
      synchronize_rcu() call done after deletion from hash list, since caller
      will perform a synchronize_net() call after its ndo_stop() call.
      
      Add a new netdev->dismantle field to signal this dismantle intent.
      
      Reduces RTNL hold time.
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      CC: Patrick McHardy <kaber@trash.net>
      CC: Ben Greear <greearb@candelatech.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      449f4544
    • Linus Torvalds's avatar
      selinux: avoid unnecessary avc cache stat hit count · 257313b2
      Linus Torvalds authored
      There is no point in counting hits - we can calculate it from the number
      of lookups and misses.
      
      This makes the avc statistics a bit smaller, and makes the code
      generation better too.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      257313b2
    • Benjamin Herrenschmidt's avatar
      3d07f0e8
    • Paul Mackerras's avatar
      powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors · 593adf31
      Paul Mackerras authored
      Commits a5d4f3ad ("powerpc: Base support for exceptions using
      HSRR0/1") and 673b189a ("powerpc: Always use SPRN_SPRG_HSCRATCH0
      when running in HV mode") cause compile and link errors for 32-bit
      classic Book 3S processors when KVM is enabled.  This fixes these
      errors.
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      593adf31
    • Paul Mackerras's avatar
      powerpc/kvm: Fix kvmppc_core_pending_dec · 44075d95
      Paul Mackerras authored
      The vcpu->arch.pending_exceptions field is a bitfield indexed by
      interrupt priority number as returned by kvmppc_book3s_vec2irqprio.
      However, kvmppc_core_pending_dec was using an interrupt vector shifted
      by 7 as the bit index.  Fix it to use the irqprio value for the
      decrementer interrupt instead.  This problem was found by code
      inspection.
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      44075d95
    • Linus Torvalds's avatar
      selinux: de-crapify avc cache stat code generation · 044aea9b
      Linus Torvalds authored
      You can turn off the avc cache stats, but distributions seem to not do
      that (perhaps because several performance tuning how-to's talk about the
      avc cache statistics).
      
      Which is sad, because the code it generates is truly horrendous, with
      the statistics update being sandwitched between get_cpu/put_cpu which in
      turn causes preemption disables etc.  We're talking ten+ instructions
      just to increment a per-cpu variable in some pretty hot code.
      
      Fix the craziness by just using 'this_cpu_inc()' instead.  Suddenly we
      only need a single 'inc' instruction to increment the statistics.  This
      is quite noticeable in the incredibly hot avc_has_perm_noaudit()
      function (which triggers all the statistics by virtue of doing an
      avc_lookup() call).
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      044aea9b
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of... · 39ab05c8
      Linus Torvalds authored
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
        debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
        sysfs: remove "last sysfs file:" line from the oops messages
        drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
        memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
        SYSFS: Fix erroneous comments for sysfs_update_group().
        driver core: remove the driver-model structures from the documentation
        driver core: Add the device driver-model structures to kerneldoc
        Translated Documentation/email-clients.txt
        RAW driver: Remove call to kobject_put().
        reboot: disable usermodehelper to prevent fs access
        efivars: prevent oops on unload when efi is not enabled
        Allow setting of number of raw devices as a module parameter
        Introduce CONFIG_GOOGLE_FIRMWARE
        driver: Google Memory Console
        driver: Google EFI SMI
        x86: Better comments for get_bios_ebda()
        x86: get_bios_ebda_length()
        misc: fix ti-st build issues
        params.c: Use new strtobool function to process boolean inputs
        debugfs: move to new strtobool
        ...
      
      Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
      being applied twice, and an unrelated cleanup nearby.
      39ab05c8
    • Stephen Rothwell's avatar
      signal.h need a definition of struct task_struct · 1477fcc2
      Stephen Rothwell authored
      This fixes these build errors on powerpc:
      
        In file included from arch/powerpc/mm/fault.c:18:
        include/linux/signal.h:239: error: 'struct task_struct' declared inside parameter list
        include/linux/signal.h:239: error: its scope is only this definition or declaration, which is probably not what you want
        include/linux/signal.h:240: error: 'struct task_struct' declared inside parameter list
        ..
      
      Exposed by commit e66eed65 ("list: remove prefetching from regular
      list iterators"), which removed the include of <linux/prefetch.h> from
      <linux/list.h>.
      
      Without that, linux/signal.h no longer accidentally got the declaration
      of 'struct task_struct'.
      
      Fix by properly declaring the struct, rather than introducing any new
      header file dependency.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1477fcc2
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · eb04f2f0
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (78 commits)
        Revert "rcu: Decrease memory-barrier usage based on semi-formal proof"
        net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfree
        batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu
        batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()
        batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu
        net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()
        net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()
        net/mac80211,rcu: convert call_rcu(work_free_rcu) to kfree_rcu()
        net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()
        net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()
        perf,rcu: convert call_rcu(swevent_hlist_release_rcu) to kfree_rcu()
        perf,rcu: convert call_rcu(free_ctx) to kfree_rcu()
        net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()
        net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()
        net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()
        net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()
        security,rcu: convert call_rcu(sel_netif_free) to kfree_rcu()
        net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()
        net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()
        net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()
        ...
      eb04f2f0