Merge remote branch 'anholt/drm-intel-next' into drm-next

* anholt/drm-intel-next: (515 commits)
  drm/i915: Fix out of tree builds
  drm/i915: move fence lru to struct drm_i915_fence_reg
  drm/i915: don't allow tiling changes on pinned buffers v2
  drm/i915: Be extra careful about A/D matching for multifunction SDVO
  drm/i915: Fix DDC bus selection for multifunction SDVO
  drm/i915: cleanup mode setting before unmapping registers
  drm/i915: Make fbc control wrapper functions
  drm/i915: Wait for the GPU whilst shrinking, if truly desperate.
  drm/i915: Use spatio-temporal dithering on PCH
  [MTD] Remove zero-length files mtdbdi.c and internal.ho
  pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs
  libata: Fix several inaccuracies in developer's guide
  slub: Fix bad boundary check in init_kmem_cache_nodes()
  raid6: fix recovery performance regression
  KEYS: call_sbin_request_key() must write lock keyrings before modifying them
  KEYS: Use RCU dereference wrappers in keyring key type code
  KEYS: find_keyring_by_name() can gain access to a freed keyring
  ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
  ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
  ALSA: take tu->qlock with irqs disabled
  ...

1 files changed, 12 insertions, 12 deletions

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index edddd66faac6..a2ab51fa73e2 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -166,15 +166,15 @@ union offset_union {
  THUMB( "1:     "ins"   %1, [%2]\n"     )               \
  THUMB( "       add     %2, %2, #1\n"   )               \
         "2:\n"                                          \
-        "       .section .fixup,\"ax\"\n"               \
+        "       .pushsection .fixup,\"ax\"\n"           \
         "       .align  2\n"                            \
         "3:     mov     %0, #1\n"                       \
         "       b       2b\n"                           \
-        "       .previous\n"                            \
-        "       .section __ex_table,\"a\"\n"            \
+        "       .popsection\n"                          \
+        "       .pushsection __ex_table,\"a\"\n"        \
         "       .align  3\n"                            \
         "       .long   1b, 3b\n"                       \
-        "       .previous\n"                            \
+        "       .popsection\n"                          \
         : "=r" (err), "=&r" (val), "=r" (addr)          \
         : "0" (err), "2" (addr))
 
@@ -226,16 +226,16 @@ union offset_union {
                 "       mov     %1, %1, "NEXT_BYTE"\n"          \
                 "2:     "ins"   %1, [%2]\n"                     \
                 "3:\n"                                          \
-                "       .section .fixup,\"ax\"\n"               \
+                "       .pushsection .fixup,\"ax\"\n"           \
                 "       .align  2\n"                            \
                 "4:     mov     %0, #1\n"                       \
                 "       b       3b\n"                           \
-                "       .previous\n"                            \
-                "       .section __ex_table,\"a\"\n"            \
+                "       .popsection\n"                          \
+                "       .pushsection __ex_table,\"a\"\n"        \
                 "       .align  3\n"                            \
                 "       .long   1b, 4b\n"                       \
                 "       .long   2b, 4b\n"                       \
-                "       .previous\n"                            \
+                "       .popsection\n"                          \
                 : "=r" (err), "=&r" (v), "=&r" (a)              \
                 : "0" (err), "1" (v), "2" (a));                 \
                 if (err)                                        \
@@ -266,18 +266,18 @@ union offset_union {
                 "       mov     %1, %1, "NEXT_BYTE"\n"          \
                 "4:     "ins"   %1, [%2]\n"                     \
                 "5:\n"                                          \
-                "       .section .fixup,\"ax\"\n"               \
+                "       .pushsection .fixup,\"ax\"\n"           \
                 "       .align  2\n"                            \
                 "6:     mov     %0, #1\n"                       \
                 "       b       5b\n"                           \
-                "       .previous\n"                            \
-                "       .section __ex_table,\"a\"\n"            \
+                "       .popsection\n"                          \
+                "       .pushsection __ex_table,\"a\"\n"        \
                 "       .align  3\n"                            \
                 "       .long   1b, 6b\n"                       \
                 "       .long   2b, 6b\n"                       \
                 "       .long   3b, 6b\n"                       \
                 "       .long   4b, 6b\n"                       \
-                "       .previous\n"                            \
+                "       .popsection\n"                          \
                 : "=r" (err), "=&r" (v), "=&r" (a)              \
                 : "0" (err), "1" (v), "2" (a));                 \
                 if (err)                                        \