diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:25:28 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:26:15 -0400 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /arch/x86/lib/copy_user_64.S | |
| parent | 19943b0e30b05d42e494ae6fef78156ebc8c637e (diff) | |
| parent | ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'arch/x86/lib/copy_user_64.S')
| -rw-r--r-- | arch/x86/lib/copy_user_64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index f118c110af32..6ba0f7bb85ea 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S | |||
| @@ -75,6 +75,7 @@ ENTRY(copy_to_user) | |||
| 75 | jae bad_to_user | 75 | jae bad_to_user |
| 76 | ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string | 76 | ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string |
| 77 | CFI_ENDPROC | 77 | CFI_ENDPROC |
| 78 | ENDPROC(copy_to_user) | ||
| 78 | 79 | ||
| 79 | /* Standard copy_from_user with segment limit checking */ | 80 | /* Standard copy_from_user with segment limit checking */ |
| 80 | ENTRY(copy_from_user) | 81 | ENTRY(copy_from_user) |