Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
xcap
xcap-capability-linux
Commits
16af43fe
Commit
16af43fe
authored
Mar 03, 2013
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus
parents
9664ffe6
ded3ef0f
653a761e
Changes
239
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
239 changed files
with
2071 additions
and
1306 deletions
+2071
-1306
Documentation/hid/hid-sensor.txt
Documentation/hid/hid-sensor.txt
+0
-0
Documentation/kernel-parameters.txt
Documentation/kernel-parameters.txt
+1
-1
Documentation/x86/boot.txt
Documentation/x86/boot.txt
+1
-1
MAINTAINERS
MAINTAINERS
+1
-1
Makefile
Makefile
+2
-2
arch/arm/boot/Makefile
arch/arm/boot/Makefile
+2
-2
arch/arm/common/gic.c
arch/arm/common/gic.c
+23
-2
arch/arm/include/asm/delay.h
arch/arm/include/asm/delay.h
+1
-0
arch/arm/include/asm/memory.h
arch/arm/include/asm/memory.h
+1
-1
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/pgtable.h
+2
-1
arch/arm/kernel/sched_clock.c
arch/arm/kernel/sched_clock.c
+2
-2
arch/arm/kernel/smp.c
arch/arm/kernel/smp.c
+3
-0
arch/arm/lib/delay.c
arch/arm/lib/delay.c
+1
-0
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Kconfig
+1
-1
arch/arm/mach-realview/include/mach/irqs-eb.h
arch/arm/mach-realview/include/mach/irqs-eb.h
+1
-1
arch/arm/mm/alignment.c
arch/arm/mm/alignment.c
+4
-7
arch/arm/mm/dma-mapping.c
arch/arm/mm/dma-mapping.c
+1
-1
arch/arm/vfp/vfphw.S
arch/arm/vfp/vfphw.S
+21
-15
arch/arm/vfp/vfpmodule.c
arch/arm/vfp/vfpmodule.c
+1
-1
arch/avr32/include/asm/dma-mapping.h
arch/avr32/include/asm/dma-mapping.h
+10
-0
arch/blackfin/include/asm/dma-mapping.h
arch/blackfin/include/asm/dma-mapping.h
+10
-0
arch/c6x/include/asm/dma-mapping.h
arch/c6x/include/asm/dma-mapping.h
+15
-0
arch/cris/include/asm/dma-mapping.h
arch/cris/include/asm/dma-mapping.h
+10
-0
arch/frv/include/asm/dma-mapping.h
arch/frv/include/asm/dma-mapping.h
+15
-0
arch/m68k/include/asm/dma-mapping.h
arch/m68k/include/asm/dma-mapping.h
+10
-0
arch/mips/bcm47xx/Kconfig
arch/mips/bcm47xx/Kconfig
+3
-0
arch/mips/cavium-octeon/executive/cvmx-l2c.c
arch/mips/cavium-octeon/executive/cvmx-l2c.c
+5
-4
arch/mips/include/asm/dsp.h
arch/mips/include/asm/dsp.h
+1
-1
arch/mips/include/asm/inst.h
arch/mips/include/asm/inst.h
+1
-0
arch/mips/include/asm/mach-pnx833x/war.h
arch/mips/include/asm/mach-pnx833x/war.h
+1
-1
arch/mips/include/asm/pgtable-64.h
arch/mips/include/asm/pgtable-64.h
+1
-0
arch/mips/include/uapi/asm/Kbuild
arch/mips/include/uapi/asm/Kbuild
+1
-0
arch/mips/include/uapi/asm/break.h
arch/mips/include/uapi/asm/break.h
+0
-0
arch/mips/kernel/ftrace.c
arch/mips/kernel/ftrace.c
+35
-1
arch/mips/kernel/mcount.S
arch/mips/kernel/mcount.S
+4
-3
arch/mips/kernel/vpe.c
arch/mips/kernel/vpe.c
+1
-1
arch/mips/lantiq/irq.c
arch/mips/lantiq/irq.c
+1
-1
arch/mips/lib/delay.c
arch/mips/lib/delay.c
+1
-1
arch/mips/mm/ioremap.c
arch/mips/mm/ioremap.c
+0
-6
arch/mips/mm/mmap.c
arch/mips/mm/mmap.c
+6
-0
arch/mips/netlogic/xlr/setup.c
arch/mips/netlogic/xlr/setup.c
+4
-1
arch/mips/pci/pci-ar71xx.c
arch/mips/pci/pci-ar71xx.c
+1
-1
arch/mips/pci/pci-ar724x.c
arch/mips/pci/pci-ar724x.c
+1
-1
arch/mn10300/include/asm/dma-mapping.h
arch/mn10300/include/asm/dma-mapping.h
+15
-0
arch/parisc/include/asm/dma-mapping.h
arch/parisc/include/asm/dma-mapping.h
+15
-0
arch/powerpc/mm/hash_low_64.S
arch/powerpc/mm/hash_low_64.S
+35
-27
arch/x86/ia32/ia32entry.S
arch/x86/ia32/ia32entry.S
+2
-2
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/cpu/intel_cacheinfo.c
+3
-4
arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/kernel/cpu/perf_event_intel.c
+5
-1
arch/x86/kernel/cpu/perf_event_p6.c
arch/x86/kernel/cpu/perf_event_p6.c
+1
-1
arch/x86/tools/insn_sanity.c
arch/x86/tools/insn_sanity.c
+8
-2
arch/xtensa/include/asm/dma-mapping.h
arch/xtensa/include/asm/dma-mapping.h
+15
-0
block/genhd.c
block/genhd.c
+32
-10
drivers/amba/tegra-ahb.c
drivers/amba/tegra-ahb.c
+1
-1
drivers/atm/iphase.h
drivers/atm/iphase.h
+73
-73
drivers/bcma/bcma_private.h
drivers/bcma/bcma_private.h
+5
-0
drivers/bcma/driver_chipcommon_nflash.c
drivers/bcma/driver_chipcommon_nflash.c
+1
-1
drivers/bcma/driver_gpio.c
drivers/bcma/driver_gpio.c
+5
-0
drivers/bcma/main.c
drivers/bcma/main.c
+7
-0
drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_req.c
+1
-1
drivers/block/drbd/drbd_req.h
drivers/block/drbd/drbd_req.h
+1
-0
drivers/block/drbd/drbd_state.c
drivers/block/drbd/drbd_state.c
+7
-0
drivers/block/mtip32xx/mtip32xx.c
drivers/block/mtip32xx/mtip32xx.c
+18
-6
drivers/block/xen-blkback/blkback.c
drivers/block/xen-blkback/blkback.c
+11
-7
drivers/block/xen-blkfront.c
drivers/block/xen-blkfront.c
+6
-4
drivers/char/virtio_console.c
drivers/char/virtio_console.c
+2
-1
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/evergreen.c
+24
-3
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600.c
+5
-2
drivers/gpu/drm/radeon/radeon_asic.c
drivers/gpu/drm/radeon/radeon_asic.c
+3
-3
drivers/gpu/drm/radeon/radeon_combios.c
drivers/gpu/drm/radeon/radeon_combios.c
+8
-0
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_display.c
+3
-1
drivers/gpu/drm/radeon/radeon_ring.c
drivers/gpu/drm/radeon/radeon_ring.c
+3
-0
drivers/gpu/drm/radeon/reg_srcs/cayman
drivers/gpu/drm/radeon/reg_srcs/cayman
+1
-0
drivers/gpu/drm/radeon/rv515.c
drivers/gpu/drm/radeon/rv515.c
+2
-0
drivers/gpu/drm/ttm/ttm_bo_util.c
drivers/gpu/drm/ttm/ttm_bo_util.c
+8
-5
drivers/hid/hid-ids.h
drivers/hid/hid-ids.h
+3
-0
drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/i2c-hid/i2c-hid.c
+12
-1
drivers/hid/usbhid/hid-quirks.c
drivers/hid/usbhid/hid-quirks.c
+1
-0
drivers/infiniband/hw/qib/qib_qp.c
drivers/infiniband/hw/qib/qib_qp.c
+3
-8
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/infiniband/ulp/ipoib/ipoib_cm.c
+3
-3
drivers/infiniband/ulp/ipoib/ipoib_ib.c
drivers/infiniband/ulp/ipoib/ipoib_ib.c
+3
-3
drivers/md/dm-thin.c
drivers/md/dm-thin.c
+1
-12
drivers/md/dm.c
drivers/md/dm.c
+4
-2
drivers/media/radio/radio-keene.c
drivers/media/radio/radio-keene.c
+1
-0
drivers/media/radio/radio-si4713.c
drivers/media/radio/radio-si4713.c
+1
-0
drivers/media/radio/radio-wl1273.c
drivers/media/radio/radio-wl1273.c
+1
-0
drivers/media/radio/wl128x/fmdrv_v4l2.c
drivers/media/radio/wl128x/fmdrv_v4l2.c
+10
-0
drivers/mmc/host/mmci.c
drivers/mmc/host/mmci.c
+181
-125
drivers/mmc/host/mmci.h
drivers/mmc/host/mmci.h
+2
-1
drivers/mtd/devices/Kconfig
drivers/mtd/devices/Kconfig
+1
-0
drivers/mtd/maps/physmap_of.c
drivers/mtd/maps/physmap_of.c
+1
-1
drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+2
-2
drivers/mtd/nand/davinci_nand.c
drivers/mtd/nand/davinci_nand.c
+1
-1
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nand_base.c
+5
-2
drivers/net/bonding/bond_sysfs.c
drivers/net/bonding/bond_sysfs.c
+1
-0
drivers/net/can/c_can/c_can.c
drivers/net/can/c_can/c_can.c
+5
-1
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be.h
+4
-4
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/emulex/benet/be_main.c
+1
-1
drivers/net/ethernet/intel/e1000e/defines.h
drivers/net/ethernet/intel/e1000e/defines.h
+9
-0
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/e1000.h
+2
-0
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/ethernet/intel/e1000e/ethtool.c
+2
-0
drivers/net/ethernet/intel/e1000e/hw.h
drivers/net/ethernet/intel/e1000e/hw.h
+1
-0
drivers/net/ethernet/intel/e1000e/ich8lan.c
drivers/net/ethernet/intel/e1000e/ich8lan.c
+11
-0
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/e1000e/netdev.c
+46
-0
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/main.c
+1
-1
drivers/net/ethernet/via/via-rhine.c
drivers/net/ethernet/via/via-rhine.c
+2
-6
drivers/net/tun.c
drivers/net/tun.c
+24
-14
drivers/net/usb/cdc_ncm.c
drivers/net/usb/cdc_ncm.c
+3
-0
drivers/net/usb/qmi_wwan.c
drivers/net/usb/qmi_wwan.c
+13
-0
drivers/net/usb/usbnet.c
drivers/net/usb/usbnet.c
+29
-6
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/vmxnet3/vmxnet3_drv.c
+3
-4
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+21
-14
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+2
-1
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
+12
-28
drivers/net/wireless/brcm80211/brcmsmac/pub.h
drivers/net/wireless/brcm80211/brcmsmac/pub.h
+1
-2
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/dvm/tx.c
+7
-17
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/mwifiex/scan.c
+5
-4
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/base.c
+4
-3
drivers/net/wireless/rtlwifi/usb.c
drivers/net/wireless/rtlwifi/usb.c
+2
-2
drivers/net/xen-netback/common.h
drivers/net/xen-netback/common.h
+3
-0
drivers/net/xen-netback/interface.c
drivers/net/xen-netback/interface.c
+14
-9
drivers/net/xen-netback/netback.c
drivers/net/xen-netback/netback.c
+71
-44
drivers/pinctrl/Kconfig
drivers/pinctrl/Kconfig
+2
-2
drivers/pinctrl/Makefile
drivers/pinctrl/Makefile
+1
-1
drivers/pinctrl/pinctrl-sirf.c
drivers/pinctrl/pinctrl-sirf.c
+18
-0
drivers/regulator/max77686.c
drivers/regulator/max77686.c
+8
-7
drivers/regulator/max8907-regulator.c
drivers/regulator/max8907-regulator.c
+1
-2
drivers/regulator/max8997.c
drivers/regulator/max8997.c
+19
-20
drivers/regulator/max8998.c
drivers/regulator/max8998.c
+1
-1
drivers/regulator/of_regulator.c
drivers/regulator/of_regulator.c
+6
-0
drivers/regulator/s2mps11.c
drivers/regulator/s2mps11.c
+2
-2
drivers/regulator/tps65217-regulator.c
drivers/regulator/tps65217-regulator.c
+2
-2
drivers/regulator/tps65910-regulator.c
drivers/regulator/tps65910-regulator.c
+1
-1
drivers/rtc/rtc-isl1208.c
drivers/rtc/rtc-isl1208.c
+3
-0
drivers/rtc/rtc-pl031.c
drivers/rtc/rtc-pl031.c
+5
-3
drivers/rtc/rtc-vt8500.c
drivers/rtc/rtc-vt8500.c
+1
-1
drivers/ssb/driver_gpio.c
drivers/ssb/driver_gpio.c
+12
-0
drivers/ssb/main.c
drivers/ssb/main.c
+9
-0
drivers/ssb/ssb_private.h
drivers/ssb/ssb_private.h
+5
-0
drivers/target/target_core_device.c
drivers/target/target_core_device.c
+7
-1
drivers/target/target_core_fabric_configfs.c
drivers/target/target_core_fabric_configfs.c
+5
-0
drivers/target/target_core_sbc.c
drivers/target/target_core_sbc.c
+8
-10
drivers/target/target_core_spc.c
drivers/target/target_core_spc.c
+11
-33
drivers/usb/core/hcd.c
drivers/usb/core/hcd.c
+44
-0
drivers/usb/core/hub.c
drivers/usb/core/hub.c
+52
-18
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hcd.c
+1
-0
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-hub.c
+8
-1
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci-q.c
+30
-20
drivers/usb/host/ehci-sched.c
drivers/usb/host/ehci-sched.c
+6
-3
drivers/usb/host/ehci-timer.c
drivers/usb/host/ehci-timer.c
+15
-14
drivers/usb/host/pci-quirks.c
drivers/usb/host/pci-quirks.c
+1
-0
drivers/usb/host/uhci-hub.c
drivers/usb/host/uhci-hub.c
+3
-0
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci-ring.c
+9
-4
drivers/usb/serial/cp210x.c
drivers/usb/serial/cp210x.c
+1
-0
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.c
+2
-0
drivers/usb/serial/ftdi_sio_ids.h
drivers/usb/serial/ftdi_sio_ids.h
+8
-1
drivers/usb/serial/option.c
drivers/usb/serial/option.c
+13
-0
drivers/usb/serial/qcserial.c
drivers/usb/serial/qcserial.c
+1
-0
drivers/usb/storage/initializers.c
drivers/usb/storage/initializers.c
+74
-2
drivers/usb/storage/initializers.h
drivers/usb/storage/initializers.h
+2
-2
drivers/usb/storage/unusual_devs.h
drivers/usb/storage/unusual_devs.h
+2
-327
drivers/usb/storage/usb.c
drivers/usb/storage/usb.c
+12
-0
drivers/usb/storage/usual-tables.c
drivers/usb/storage/usual-tables.c
+15
-0
drivers/vhost/net.c
drivers/vhost/net.c
+28
-13
drivers/vhost/tcm_vhost.c
drivers/vhost/tcm_vhost.c
+1
-3
drivers/vhost/vhost.c
drivers/vhost/vhost.c
+15
-3
drivers/vhost/vhost.h
drivers/vhost/vhost.h
+1
-1
drivers/xen/events.c
drivers/xen/events.c
+2
-2
drivers/xen/xen-pciback/pciback_ops.c
drivers/xen/xen-pciback/pciback_ops.c
+7
-7
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+10
-12
fs/btrfs/extent_map.c
fs/btrfs/extent_map.c
+2
-1
fs/btrfs/file.c
fs/btrfs/file.c
+20
-5
fs/btrfs/ioctl.c
fs/btrfs/ioctl.c
+4
-1
fs/btrfs/ordered-data.c
fs/btrfs/ordered-data.c
+10
-3
fs/btrfs/scrub.c
fs/btrfs/scrub.c
+20
-5
fs/btrfs/transaction.c
fs/btrfs/transaction.c
+19
-8
fs/btrfs/volumes.c
fs/btrfs/volumes.c
+2
-1
fs/dlm/user.c
fs/dlm/user.c
+4
-4
fs/nfs/namespace.c
fs/nfs/namespace.c
+20
-0
fs/nfs/nfs4client.c
fs/nfs/nfs4client.c
+26
-36
fs/nfs/nfs4state.c
fs/nfs/nfs4state.c
+14
-8
fs/nfs/super.c
fs/nfs/super.c
+9
-13
fs/nilfs2/ioctl.c
fs/nilfs2/ioctl.c
+4
-1
include/linux/llist.h
include/linux/llist.h
+25
-0
include/linux/memcontrol.h
include/linux/memcontrol.h
+1
-1
include/linux/mmu_notifier.h
include/linux/mmu_notifier.h
+1
-1
include/linux/usb.h
include/linux/usb.h
+2
-0
include/linux/usb/hcd.h
include/linux/usb/hcd.h
+3
-0
include/linux/usb/usbnet.h
include/linux/usb/usbnet.h
+3
-1
include/net/transp_v6.h
include/net/transp_v6.h
+11
-11
include/uapi/linux/usb/ch9.h
include/uapi/linux/usb/ch9.h
+6
-0
kernel/events/core.c
kernel/events/core.c
+18
-2
kernel/rcutree_plugin.h
kernel/rcutree_plugin.h
+10
-3
kernel/sched/debug.c
kernel/sched/debug.c
+2
-2
kernel/sched/fair.c
kernel/sched/fair.c
+1
-1
kernel/sched/rt.c
kernel/sched/rt.c
+1
-1
lib/digsig.c
lib/digsig.c
+2
-0
mm/huge_memory.c
mm/huge_memory.c
+4
-0
mm/hugetlb.c
mm/hugetlb.c
+1
-0
mm/migrate.c
mm/migrate.c
+3
-1
mm/mmap.c
mm/mmap.c
+1
-1
net/bluetooth/hci_conn.c
net/bluetooth/hci_conn.c
+3
-3
net/bluetooth/smp.c
net/bluetooth/smp.c
+13
-0
net/core/pktgen.c
net/core/pktgen.c
+6
-3
net/core/skbuff.c
net/core/skbuff.c
+1
-1
net/ipv4/tcp_cong.c
net/ipv4/tcp_cong.c
+10
-4
net/ipv4/tcp_input.c
net/ipv4/tcp_input.c
+6
-2
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_ipv4.c
+5
-1
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+1
-0
net/ipv6/datagram.c
net/ipv6/datagram.c
+9
-7
net/ipv6/ip6_flowlabel.c
net/ipv6/ip6_flowlabel.c
+2
-2
net/ipv6/ip6_gre.c
net/ipv6/ip6_gre.c
+1
-1
net/ipv6/ipv6_sockglue.c
net/ipv6/ipv6_sockglue.c
+3
-3
net/ipv6/raw.c
net/ipv6/raw.c
+3
-3
net/ipv6/route.c
net/ipv6/route.c
+1
-1
net/ipv6/tcp_ipv6.c
net/ipv6/tcp_ipv6.c
+5
-1
net/ipv6/udp.c
net/ipv6/udp.c
+3
-3
net/l2tp/l2tp_core.c
net/l2tp/l2tp_core.c
+65
-17
net/l2tp/l2tp_core.h
net/l2tp/l2tp_core.h
+4
-1
net/l2tp/l2tp_ip6.c
net/l2tp/l2tp_ip6.c
+5
-5
net/l2tp/l2tp_ppp.c
net/l2tp/l2tp_ppp.c
+0
-6
net/openvswitch/vport-netdev.c
net/openvswitch/vport-netdev.c
+9
-7
net/packet/af_packet.c
net/packet/af_packet.c
+6
-4
net/sched/sch_netem.c
net/sched/sch_netem.c
+6
-6
net/sctp/auth.c
net/sctp/auth.c
+1
-1
net/sctp/endpointola.c
net/sctp/endpointola.c
+5
-0
net/sctp/socket.c
net/sctp/socket.c
+1
-1
net/sunrpc/sched.c
net/sunrpc/sched.c
+17
-1
net/sunrpc/svcsock.c
net/sunrpc/svcsock.c
+1
-1
net/wireless/scan.c
net/wireless/scan.c
+1
-1
samples/seccomp/Makefile
samples/seccomp/Makefile
+2
-0
scripts/checkpatch.pl
scripts/checkpatch.pl
+5
-5
sound/soc/fsl/Kconfig
sound/soc/fsl/Kconfig
+7
-2
sound/soc/fsl/Makefile
sound/soc/fsl/Makefile
+1
-4
sound/soc/fsl/imx-pcm-dma.c
sound/soc/fsl/imx-pcm-dma.c
+1
-20
sound/soc/fsl/imx-pcm-fiq.c
sound/soc/fsl/imx-pcm-fiq.c
+1
-21
sound/soc/fsl/imx-pcm.c
sound/soc/fsl/imx-pcm.c
+35
-0
sound/soc/fsl/imx-pcm.h
sound/soc/fsl/imx-pcm.h
+18
-0
tools/vm/.gitignore
tools/vm/.gitignore
+2
-0
No files found.
Documentation/hid/hid-sensor.txt
100755 → 100644
View file @
16af43fe
File mode changed from 100755 to 100644
Documentation/kernel-parameters.txt
View file @
16af43fe
...
...
@@ -2438,7 +2438,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
real-time workloads. It can also improve energy
efficiency for asymmetric multiprocessors.
rcu_nocb
s
_poll [KNL,BOOT]
rcu_nocb_poll [KNL,BOOT]
Rather than requiring that offloaded CPUs
(specified by rcu_nocbs= above) explicitly
awaken the corresponding "rcuoN" kthreads,
...
...
Documentation/x86/boot.txt
View file @
16af43fe
...
...
@@ -57,7 +57,7 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment
Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover
protocol entry point.
Protocol 2.12: (Kernel 3.
9
) Added the xloadflags field and extension fields
Protocol 2.12: (Kernel 3.
8
) Added the xloadflags field and extension fields
to struct boot_params for for loading bzImage and ramdisk
above 4G in 64bit.
...
...
MAINTAINERS
View file @
16af43fe
...
...
@@ -1489,7 +1489,7 @@ AVR32 ARCHITECTURE
M: Haavard Skinnemoen <hskinnemoen@gmail.com>
M: Hans-Christian Egtvedt <egtvedt@samfundet.no>
W: http://www.atmel.com/products/AVR32/
W: http://avr32linux.org/
W: http://
mirror.egtvedt.no/
avr32linux.org/
W: http://avrfreaks.net/
S: Maintained
F: arch/avr32/
...
...
Makefile
View file @
16af43fe
VERSION
=
3
PATCHLEVEL
=
8
SUBLEVEL
=
0
EXTRAVERSION
=
-rc
5
NAME
=
Terrified Chipmunk
EXTRAVERSION
=
-rc
7
NAME
=
Unicycling Gorilla
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
...
...
arch/arm/boot/Makefile
View file @
16af43fe
...
...
@@ -68,8 +68,8 @@ else
endif
check_for_multiple_loadaddr
=
\
if
[
$(
words
$(UIMAGE_LOADADDR)
)
-
gt
1
]
;
then
\
echo
'multiple load addresses:
$(UIMAGE_LOADADDR)
'
;
\
if
[
$(
words
$(UIMAGE_LOADADDR)
)
-
ne
1
]
;
then
\
echo
'multiple
(or no)
load addresses:
$(UIMAGE_LOADADDR)
'
;
\
echo
'This is incompatible with uImages'
;
\
echo
'Specify LOADADDR on the commandline to build an uImage'
;
\
false
;
\
...
...
arch/arm/common/gic.c
View file @
16af43fe
...
...
@@ -351,6 +351,25 @@ void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)
irq_set_chained_handler
(
irq
,
gic_handle_cascade_irq
);
}
static
u8
gic_get_cpumask
(
struct
gic_chip_data
*
gic
)
{
void
__iomem
*
base
=
gic_data_dist_base
(
gic
);
u32
mask
,
i
;
for
(
i
=
mask
=
0
;
i
<
32
;
i
+=
4
)
{
mask
=
readl_relaxed
(
base
+
GIC_DIST_TARGET
+
i
);
mask
|=
mask
>>
16
;
mask
|=
mask
>>
8
;
if
(
mask
)
break
;
}
if
(
!
mask
)
pr_crit
(
"GIC CPU mask not found - kernel will fail to boot.
\n
"
);
return
mask
;
}
static
void
__init
gic_dist_init
(
struct
gic_chip_data
*
gic
)
{
unsigned
int
i
;
...
...
@@ -369,7 +388,9 @@ static void __init gic_dist_init(struct gic_chip_data *gic)
/*
* Set all global interrupts to this CPU only.
*/
cpumask
=
readl_relaxed
(
base
+
GIC_DIST_TARGET
+
0
);
cpumask
=
gic_get_cpumask
(
gic
);
cpumask
|=
cpumask
<<
8
;
cpumask
|=
cpumask
<<
16
;
for
(
i
=
32
;
i
<
gic_irqs
;
i
+=
4
)
writel_relaxed
(
cpumask
,
base
+
GIC_DIST_TARGET
+
i
*
4
/
4
);
...
...
@@ -400,7 +421,7 @@ static void __cpuinit gic_cpu_init(struct gic_chip_data *gic)
* Get what the GIC says our CPU mask is.
*/
BUG_ON
(
cpu
>=
NR_GIC_CPU_IF
);
cpu_mask
=
readl_relaxed
(
dist_base
+
GIC_DIST_TARGET
+
0
);
cpu_mask
=
gic_get_cpumask
(
gic
);
gic_cpu_map
[
cpu
]
=
cpu_mask
;
/*
...
...
arch/arm/include/asm/delay.h
View file @
16af43fe
...
...
@@ -24,6 +24,7 @@ extern struct arm_delay_ops {
void
(
*
delay
)(
unsigned
long
);
void
(
*
const_udelay
)(
unsigned
long
);
void
(
*
udelay
)(
unsigned
long
);
bool
const_clock
;
}
arm_delay_ops
;
#define __delay(n) arm_delay_ops.delay(n)
...
...
arch/arm/include/asm/memory.h
View file @
16af43fe
...
...
@@ -37,7 +37,7 @@
*/
#define PAGE_OFFSET UL(CONFIG_PAGE_OFFSET)
#define TASK_SIZE (UL(CONFIG_PAGE_OFFSET) - UL(0x01000000))
#define TASK_UNMAPPED_BASE
(UL(CONFIG_PAGE_OFFSET) / 3
)
#define TASK_UNMAPPED_BASE
ALIGN(TASK_SIZE / 3, SZ_16M
)
/*
* The maximum size of a 26-bit user space task.
...
...
arch/arm/include/asm/pgtable.h
View file @
16af43fe
...
...
@@ -247,7 +247,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
static
inline
pte_t
pte_modify
(
pte_t
pte
,
pgprot_t
newprot
)
{
const
pteval_t
mask
=
L_PTE_XN
|
L_PTE_RDONLY
|
L_PTE_USER
|
L_PTE_NONE
;
const
pteval_t
mask
=
L_PTE_XN
|
L_PTE_RDONLY
|
L_PTE_USER
|
L_PTE_NONE
|
L_PTE_VALID
;
pte_val
(
pte
)
=
(
pte_val
(
pte
)
&
~
mask
)
|
(
pgprot_val
(
newprot
)
&
mask
);
return
pte
;
}
...
...
arch/arm/kernel/sched_clock.c
View file @
16af43fe
...
...
@@ -93,11 +93,11 @@ static void notrace update_sched_clock(void)
* detectable in cyc_to_fixed_sched_clock().
*/
raw_local_irq_save
(
flags
);
cd
.
epoch_cyc
=
cyc
;
cd
.
epoch_cyc
_copy
=
cyc
;
smp_wmb
();
cd
.
epoch_ns
=
ns
;
smp_wmb
();
cd
.
epoch_cyc
_copy
=
cyc
;
cd
.
epoch_cyc
=
cyc
;
raw_local_irq_restore
(
flags
);
}
...
...
arch/arm/kernel/smp.c
View file @
16af43fe
...
...
@@ -686,6 +686,9 @@ static int cpufreq_callback(struct notifier_block *nb,
if
(
freq
->
flags
&
CPUFREQ_CONST_LOOPS
)
return
NOTIFY_OK
;
if
(
arm_delay_ops
.
const_clock
)
return
NOTIFY_OK
;
if
(
!
per_cpu
(
l_p_j_ref
,
cpu
))
{
per_cpu
(
l_p_j_ref
,
cpu
)
=
per_cpu
(
cpu_data
,
cpu
).
loops_per_jiffy
;
...
...
arch/arm/lib/delay.c
View file @
16af43fe
...
...
@@ -77,6 +77,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer)
arm_delay_ops
.
delay
=
__timer_delay
;
arm_delay_ops
.
const_udelay
=
__timer_const_udelay
;
arm_delay_ops
.
udelay
=
__timer_udelay
;
arm_delay_ops
.
const_clock
=
true
;
delay_calibrated
=
true
;
}
else
{
pr_info
(
"Ignoring duplicate/late registration of read_current_timer delay
\n
"
);
...
...
arch/arm/mach-exynos/Kconfig
View file @
16af43fe
...
...
@@ -414,7 +414,7 @@ config MACH_EXYNOS4_DT
select CPU_EXYNOS4210
select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
select PINCTRL
select PINCTRL_EXYNOS
4
select PINCTRL_EXYNOS
select USE_OF
help
Machine support for Samsung Exynos4 machine with device tree enabled.
...
...
arch/arm/mach-realview/include/mach/irqs-eb.h
View file @
16af43fe
...
...
@@ -115,7 +115,7 @@
/*
* Only define NR_IRQS if less than NR_IRQS_EB
*/
#define NR_IRQS_EB (IRQ_EB_GIC_START +
96
)
#define NR_IRQS_EB (IRQ_EB_GIC_START +
128
)
#if defined(CONFIG_MACH_REALVIEW_EB) \
&& (!defined(NR_IRQS) || (NR_IRQS < NR_IRQS_EB))
...
...
arch/arm/mm/alignment.c
View file @
16af43fe
...
...
@@ -749,7 +749,6 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
unsigned
long
instr
=
0
,
instrptr
;
int
(
*
handler
)(
unsigned
long
addr
,
unsigned
long
instr
,
struct
pt_regs
*
regs
);
unsigned
int
type
;
mm_segment_t
fs
;
unsigned
int
fault
;
u16
tinstr
=
0
;
int
isize
=
4
;
...
...
@@ -760,16 +759,15 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
instrptr
=
instruction_pointer
(
regs
);
fs
=
get_fs
();
set_fs
(
KERNEL_DS
);
if
(
thumb_mode
(
regs
))
{
fault
=
__get_user
(
tinstr
,
(
u16
*
)(
instrptr
&
~
1
));
u16
*
ptr
=
(
u16
*
)(
instrptr
&
~
1
);
fault
=
probe_kernel_address
(
ptr
,
tinstr
);
if
(
!
fault
)
{
if
(
cpu_architecture
()
>=
CPU_ARCH_ARMv7
&&
IS_T32
(
tinstr
))
{
/* Thumb-2 32-bit */
u16
tinst2
=
0
;
fault
=
__get_user
(
tinst2
,
(
u16
*
)(
instrptr
+
2
)
);
fault
=
probe_kernel_address
(
ptr
+
1
,
tinst2
);
instr
=
(
tinstr
<<
16
)
|
tinst2
;
thumb2_32b
=
1
;
}
else
{
...
...
@@ -778,8 +776,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
}
}
}
else
fault
=
__get_user
(
instr
,
(
u32
*
)
instrptr
);
set_fs
(
fs
);
fault
=
probe_kernel_address
(
instrptr
,
instr
);
if
(
fault
)
{
type
=
TYPE_FAULT
;
...
...
arch/arm/mm/dma-mapping.c
View file @
16af43fe
...
...
@@ -640,7 +640,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
if
(
is_coherent
||
nommu
())
addr
=
__alloc_simple_buffer
(
dev
,
size
,
gfp
,
&
page
);
else
if
(
gfp
&
GFP_
ATOMIC
)
else
if
(
!
(
gfp
&
__
GFP_
WAIT
)
)
addr
=
__alloc_from_pool
(
size
,
&
page
);
else
if
(
!
IS_ENABLED
(
CONFIG_CMA
))
addr
=
__alloc_remap_buffer
(
dev
,
size
,
gfp
,
prot
,
&
page
,
caller
);
...
...
arch/arm/vfp/vfphw.S
View file @
16af43fe
...
...
@@ -22,12 +22,14 @@
.
macro
DBGSTR
,
str
#ifdef DEBUG
stmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
add
r0
,
pc
,
#
4
ldr
r0
,
=
1
f
bl
printk
b
1
f
.
asciz
KERN_DEBUG
"VFP: \str\n"
.
balign
4
1
:
ldmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
ldmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
.
pushsection
.
rodata
,
"a"
1
:
.
ascii
KERN_DEBUG
"VFP: \str\n"
.
byte
0
.
previous
#endif
.
endm
...
...
@@ -35,12 +37,14 @@
#ifdef DEBUG
stmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
mov
r1
,
\
arg
add
r0
,
pc
,
#
4
ldr
r0
,
=
1
f
bl
printk
b
1
f
.
asciz
KERN_DEBUG
"VFP: \str\n"
.
balign
4
1
:
ldmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
ldmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
.
pushsection
.
rodata
,
"a"
1
:
.
ascii
KERN_DEBUG
"VFP: \str\n"
.
byte
0
.
previous
#endif
.
endm
...
...
@@ -50,12 +54,14 @@
mov
r3
,
\
arg3
mov
r2
,
\
arg2
mov
r1
,
\
arg1
add
r0
,
pc
,
#
4
ldr
r0
,
=
1
f
bl
printk
b
1
f
.
asciz
KERN_DEBUG
"VFP: \str\n"
.
balign
4
1
:
ldmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
ldmfd
sp
!,
{
r0
-
r3
,
ip
,
lr
}
.
pushsection
.
rodata
,
"a"
1
:
.
ascii
KERN_DEBUG
"VFP: \str\n"
.
byte
0
.
previous
#endif
.
endm
...
...
arch/arm/vfp/vfpmodule.c
View file @
16af43fe
...
...
@@ -413,7 +413,7 @@ void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
* If there isn't a second FP instruction, exit now. Note that
* the FPEXC.FP2V bit is valid only if FPEXC.EX is 1.
*/
if
(
fpexc
^
(
FPEXC_EX
|
FPEXC_FP2V
))
if
(
(
fpexc
&
(
FPEXC_EX
|
FPEXC_FP2V
))
!=
(
FPEXC_EX
|
FPEXC_FP2V
))
goto
exit
;
/*
...
...
arch/avr32/include/asm/dma-mapping.h
View file @
16af43fe
...
...
@@ -336,4 +336,14 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
/* drivers/base/dma-mapping.c */
extern
int
dma_common_mmap
(
struct
device
*
dev
,
struct
vm_area_struct
*
vma
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
extern
int
dma_common_get_sgtable
(
struct
device
*
dev
,
struct
sg_table
*
sgt
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
#endif
/* __ASM_AVR32_DMA_MAPPING_H */
arch/blackfin/include/asm/dma-mapping.h
View file @
16af43fe
...
...
@@ -154,4 +154,14 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
_dma_sync
((
dma_addr_t
)
vaddr
,
size
,
dir
);
}
/* drivers/base/dma-mapping.c */
extern
int
dma_common_mmap
(
struct
device
*
dev
,
struct
vm_area_struct
*
vma
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
extern
int
dma_common_get_sgtable
(
struct
device
*
dev
,
struct
sg_table
*
sgt
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
#endif
/* _BLACKFIN_DMA_MAPPING_H */
arch/c6x/include/asm/dma-mapping.h
View file @
16af43fe
...
...
@@ -89,4 +89,19 @@ extern void dma_free_coherent(struct device *, size_t, void *, dma_addr_t);
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent((d), (s), (h), (f))
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent((d), (s), (v), (h))
/* Not supported for now */
static
inline
int
dma_mmap_coherent
(
struct
device
*
dev
,
struct
vm_area_struct
*
vma
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
)
{
return
-
EINVAL
;
}
static
inline
int
dma_get_sgtable
(
struct
device
*
dev
,
struct
sg_table
*
sgt
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
)
{
return
-
EINVAL
;
}
#endif
/* _ASM_C6X_DMA_MAPPING_H */
arch/cris/include/asm/dma-mapping.h
View file @
16af43fe
...
...
@@ -158,5 +158,15 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
{
}
/* drivers/base/dma-mapping.c */
extern
int
dma_common_mmap
(
struct
device
*
dev
,
struct
vm_area_struct
*
vma
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
extern
int
dma_common_get_sgtable
(
struct
device
*
dev
,
struct
sg_table
*
sgt
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
#endif
arch/frv/include/asm/dma-mapping.h
View file @
16af43fe
...
...
@@ -132,4 +132,19 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
flush_write_buffers
();
}
/* Not supported for now */
static
inline
int
dma_mmap_coherent
(
struct
device
*
dev
,
struct
vm_area_struct
*
vma
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
)
{
return
-
EINVAL
;
}
static
inline
int
dma_get_sgtable
(
struct
device
*
dev
,
struct
sg_table
*
sgt
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
)
{
return
-
EINVAL
;
}
#endif
/* _ASM_DMA_MAPPING_H */
arch/m68k/include/asm/dma-mapping.h
View file @
16af43fe
...
...
@@ -115,4 +115,14 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
#include <asm-generic/dma-mapping-broken.h>
#endif
/* drivers/base/dma-mapping.c */
extern
int
dma_common_mmap
(
struct
device
*
dev
,
struct
vm_area_struct
*
vma
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
extern
int
dma_common_get_sgtable
(
struct
device
*
dev
,
struct
sg_table
*
sgt
,
void
*
cpu_addr
,
dma_addr_t
dma_addr
,
size_t
size
);
#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
#endif
/* _M68K_DMA_MAPPING_H */
arch/mips/bcm47xx/Kconfig
View file @
16af43fe
...
...
@@ -8,8 +8,10 @@ config BCM47XX_SSB
select SSB_DRIVER_EXTIF
select SSB_EMBEDDED
select SSB_B43_PCI_BRIDGE if PCI
select SSB_DRIVER_PCICORE if PCI
select SSB_PCICORE_HOSTMODE if PCI
select SSB_DRIVER_GPIO
select GPIOLIB
default y
help
Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.
...
...
@@ -25,6 +27,7 @@ config BCM47XX_BCMA
select BCMA_HOST_PCI if PCI
select BCMA_DRIVER_PCI_HOSTMODE if PCI
select BCMA_DRIVER_GPIO
select GPIOLIB
default y
help
Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.
...
...
arch/mips/cavium-octeon/executive/cvmx-l2c.c
View file @
16af43fe
...
...
@@ -30,6 +30,7 @@
* measurement, and debugging facilities.
*/
#include <linux/compiler.h>
#include <linux/irqflags.h>
#include <asm/octeon/cvmx.h>
#include <asm/octeon/cvmx-l2c.h>
...
...
@@ -285,22 +286,22 @@ uint64_t cvmx_l2c_read_perf(uint32_t counter)
*/
static
void
fault_in
(
uint64_t
addr
,
int
len
)
{
volatile
char
*
ptr
;
volatile
char
dummy
;
char
*
ptr
;
/*
* Adjust addr and length so we get all cache lines even for
* small ranges spanning two cache lines.
*/
len
+=
addr
&
CVMX_CACHE_LINE_MASK
;
addr
&=
~
CVMX_CACHE_LINE_MASK
;
ptr
=
(
volatile
char
*
)
cvmx_phys_to_ptr
(
addr
);
ptr
=
cvmx_phys_to_ptr
(
addr
);
/*
* Invalidate L1 cache to make sure all loads result in data
* being in L2.
*/
CVMX_DCACHE_INVALIDATE
;
while
(
len
>
0
)
{
dummy
+=
*
ptr
;
ACCESS_ONCE
(
*
ptr
)
;
len
-=
CVMX_CACHE_LINE_SIZE
;
ptr
+=
CVMX_CACHE_LINE_SIZE
;
}
...
...
arch/mips/include/asm/dsp.h
View file @
16af43fe
...
...
@@ -16,7 +16,7 @@
#include <asm/mipsregs.h>
#define DSP_DEFAULT 0x00000000
#define DSP_MASK 0x3f
f
#define DSP_MASK 0x3f
#define __enable_dsp_hazard() \
do { \
...
...
arch/mips/include/asm/inst.h
View file @
16af43fe
...
...
@@ -353,6 +353,7 @@ union mips_instruction {
struct
u_format
u_format
;
struct
c_format
c_format
;
struct
r_format
r_format
;
struct
p_format
p_format
;
struct
f_format
f_format
;
struct
ma_format
ma_format
;
struct
b_format
b_format
;
...
...
arch/mips/include/asm/mach-pnx833x/war.h
View file @
16af43fe
...
...
@@ -21,4 +21,4 @@
#define R10000_LLSC_WAR 0
#define MIPS34K_MISSED_ITLB_WAR 0
#endif
/* __ASM_MIPS_MACH_PNX8
550
_WAR_H */
#endif
/* __ASM_MIPS_MACH_PNX8
33X
_WAR_H */
arch/mips/include/asm/pgtable-64.h
View file @
16af43fe
...
...
@@ -230,6 +230,7 @@ static inline void pud_clear(pud_t *pudp)
#else
#define pte_pfn(x) ((unsigned long)((x).pte >> _PFN_SHIFT))
#define pfn_pte(pfn, prot) __pte(((pfn) << _PFN_SHIFT) | pgprot_val(prot))
#define pfn_pmd(pfn, prot) __pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot))
#endif
#define __pgd_offset(address) pgd_index(address)
...
...
arch/mips/include/uapi/asm/Kbuild
View file @
16af43fe
...
...
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
header-y += auxvec.h
header-y += bitsperlong.h
header-y += break.h
header-y += byteorder.h
header-y += cachectl.h
header-y += errno.h
...
...
arch/mips/include/asm/break.h
→
arch/mips/include/
uapi/
asm/break.h
View file @
16af43fe
File moved
arch/mips/kernel/ftrace.c
View file @
16af43fe
...
...
@@ -25,6 +25,12 @@
#define MCOUNT_OFFSET_INSNS 4
#endif
/* Arch override because MIPS doesn't need to run this from stop_machine() */
void
arch_ftrace_update_code
(
int
command
)
{
ftrace_modify_all_code
(
command
);
}
/*
* Check if the address is in kernel space
*
...
...
@@ -89,6 +95,24 @@ static int ftrace_modify_code(unsigned long ip, unsigned int new_code)
return
0
;
}
#ifndef CONFIG_64BIT
static
int
ftrace_modify_code_2
(
unsigned
long
ip
,
unsigned
int