Merge branch 'x86/fpu' into x86/smap

Browse source

Reason for merge:
       x86/fpu changed the structure of some of the code that x86/smap
       changes; mostly fpu-internal.h but also minor changes to the
       signal code.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Resolved Conflicts:
	arch/x86/ia32/ia32_signal.c
	arch/x86/include/asm/fpu-internal.h
	arch/x86/kernel/signal.c

...

This commit is contained in:

H. Peter Anvin 2012-09-21 17:18:44 -07:00

parent e59d1b0a24 b1a74bf821

commit 49b8c695e3

90 changed files with 1106 additions and 1145 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

Documentation/kernel-parameters.txt

View file

21

arch/x86/ia32/ia32_signal.c

View file

2

arch/x86/ia32/sys_ia32.c

View file

3

arch/x86/include/asm/cpufeature.h

View file

413

arch/x86/include/asm/fpu-internal.h

View file

29

arch/x86/include/asm/i387.h

View file

6

arch/x86/include/asm/iommu_table.h

View file

4

arch/x86/include/asm/signal.h

View file

2

arch/x86/include/asm/sys_ia32.h

View file

3

arch/x86/include/asm/vdso.h

View file

56

arch/x86/include/asm/xor_32.h

View file

61

arch/x86/include/asm/xor_64.h

View file

54

arch/x86/include/asm/xor_avx.h

View file

13

arch/x86/include/asm/xsave.h

View file

7

arch/x86/kernel/cpu/bugs.c

View file

2

arch/x86/kernel/cpu/common.c

View file

292

arch/x86/kernel/i387.c

View file

2

arch/x86/kernel/probe_roms.c

View file

22

arch/x86/kernel/process.c

View file

4

arch/x86/kernel/process_32.c

View file

4

arch/x86/kernel/process_64.c

View file

3

arch/x86/kernel/ptrace.c

View file

215

arch/x86/kernel/signal.c

View file

5

arch/x86/kernel/traps.c

View file

537

arch/x86/kernel/xsave.c

View file

10

arch/x86/kvm/vmx.c

View file

3

arch/x86/kvm/x86.c

View file

10

drivers/lguest/x86/core.c

View file

4

drivers/net/can/sja1000/sja1000_platform.c

View file

7

drivers/net/can/softing/softing_fw.c

View file

3

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

View file

4

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

View file

4

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

View file

2

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

View file

18

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

View file

10

drivers/net/ethernet/cirrus/cs89x0.c

View file

6

drivers/net/ethernet/emulex/benet/be_cmds.c

View file

2

drivers/net/ethernet/emulex/benet/be_main.c

View file

2

drivers/net/ethernet/freescale/gianfar.c

View file

1

drivers/net/ethernet/intel/e1000e/e1000.h

View file

48

drivers/net/ethernet/intel/e1000e/netdev.c

View file

4

drivers/net/ethernet/sfc/ethtool.c

View file

5

drivers/net/ethernet/stmicro/stmmac/common.h

View file

6

drivers/net/ethernet/stmicro/stmmac/descs.h

View file

5

drivers/net/ethernet/stmicro/stmmac/descs_com.h

View file

5

drivers/net/ethernet/stmicro/stmmac/dwmac100.h

View file

5

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h

View file

5

drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h

View file

5

drivers/net/ethernet/stmicro/stmmac/mmc.h

View file

6

drivers/net/ethernet/stmicro/stmmac/mmc_core.c

View file

5

drivers/net/ethernet/stmicro/stmmac/stmmac.h

View file

4

drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h

View file

4

drivers/net/ethernet/ti/davinci_mdio.c

View file

2

drivers/net/fddi/skfp/pmf.c

View file

4

drivers/net/usb/qmi_wwan.c

View file

2

drivers/net/usb/usbnet.c

View file

2

drivers/net/wireless/ath/ath5k/eeprom.c

View file

1

drivers/net/wireless/ath/ath5k/eeprom.h

View file

3

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

View file

3

drivers/net/wireless/ipw2x00/ipw2100.c

View file

3

drivers/net/wireless/iwlwifi/dvm/debugfs.c

View file

2

drivers/net/wireless/iwlwifi/pcie/internal.h

View file

2

drivers/net/wireless/iwlwifi/pcie/rx.c

View file

30

drivers/net/wireless/iwlwifi/pcie/trans.c

View file

39

drivers/net/xen-netfront.c

View file

11

fs/cifs/cifssmb.c

View file

9

fs/cifs/dir.c

View file

24

fs/cifs/inode.c

View file

2

fs/cifs/link.c

View file

16

fs/cifs/smb2misc.c

View file

10

fs/cifs/smb2pdu.h

View file

9

fs/cifs/transport.c

View file

2

include/linux/pci_ids.h

View file

1

include/net/netfilter/nf_conntrack_ecache.h

View file

10

net/core/netpoll.c

View file

14

net/ipv4/ipmr.c

View file

5

net/ipv4/netfilter/nf_nat_sip.c

View file

6

net/ipv4/route.c

View file

15

net/ipv4/tcp_input.c

View file

6

net/ipv6/esp6.c

View file

3

net/l2tp/l2tp_core.c

View file

1

net/l2tp/l2tp_core.h

View file

38

net/mac80211/tx.c

View file

4

net/netfilter/ipvs/ip_vs_ctl.c

View file

16

net/netfilter/nf_conntrack_core.c

View file

3

net/netfilter/nf_conntrack_netlink.c

View file

6

net/netfilter/nfnetlink_log.c

View file

4

net/netlink/af_netlink.c

View file

2

net/packet/af_packet.c

View file

4

net/xfrm/xfrm_state.c

View file