Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  rtmutex: Add missing rcu_read_unlock() in debug_rt_mutex_print_deadlock()
  lockdep: Comment all warnings
  lib: atomic64: Change the type of local lock to raw_spinlock_t
  locking, lib/atomic64: Annotate atomic64_lock::lock as raw
  locking, x86, iommu: Annotate qi->q_lock as raw
  locking, x86, iommu: Annotate irq_2_ir_lock as raw
  locking, x86, iommu: Annotate iommu->register_lock as raw
  locking, dma, ipu: Annotate bank_lock as raw
  locking, ARM: Annotate low level hw locks as raw
  locking, drivers/dca: Annotate dca_lock as raw
  locking, powerpc: Annotate uic->lock as raw
  locking, x86: mce: Annotate cmci_discover_lock as raw
  locking, ACPI: Annotate c3_lock as raw
  locking, oprofile: Annotate oprofilefs lock as raw
  locking, video: Annotate vga console lock as raw
  locking, latencytop: Annotate latency_lock as raw
  locking, timer_stats: Annotate table_lock as raw
  locking, rwsem: Annotate inner lock as raw
  locking, semaphores: Annotate inner lock as raw
  locking, sched: Annotate thread_group_cputimer as raw
  ...

Fix up conflicts in kernel/posix-cpu-timers.c manually: making
cputimer->cputime a raw lock conflicted with the ABBA fix in commit
bcd5cff7216f ("cputimer: Cure lock inversion").

1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 915fd74da7a2..d449a74d4a31 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -50,7 +50,7 @@
 #include <video/vga.h>
 #include <asm/io.h>
 
-static DEFINE_SPINLOCK(vga_lock);
+static DEFINE_RAW_SPINLOCK(vga_lock);
 static int cursor_size_lastfrom;
 static int cursor_size_lastto;
 static u32 vgacon_xres;
@@ -157,7 +157,7 @@ static inline void write_vga(unsigned char reg, unsigned int val)
          * ddprintk might set the console position from interrupt
          * handlers, thus the write has to be IRQ-atomic.
          */
-        spin_lock_irqsave(&vga_lock, flags);
+        raw_spin_lock_irqsave(&vga_lock, flags);
 
 #ifndef SLOW_VGA
         v1 = reg + (val & 0xff00);
@@ -170,7 +170,7 @@ static inline void write_vga(unsigned char reg, unsigned int val)
         outb_p(reg + 1, vga_video_port_reg);
         outb_p(val & 0xff, vga_video_port_val);
 #endif
-        spin_unlock_irqrestore(&vga_lock, flags);
+        raw_spin_unlock_irqrestore(&vga_lock, flags);
 }
 
 static inline void vga_set_mem_top(struct vc_data *c)
@@ -664,7 +664,7 @@ static void vgacon_set_cursor_size(int xpos, int from, int to)
         cursor_size_lastfrom = from;
         cursor_size_lastto = to;
 
-        spin_lock_irqsave(&vga_lock, flags);
+        raw_spin_lock_irqsave(&vga_lock, flags);
         if (vga_video_type >= VIDEO_TYPE_VGAC) {
                 outb_p(VGA_CRTC_CURSOR_START, vga_video_port_reg);
                 curs = inb_p(vga_video_port_val);
@@ -682,7 +682,7 @@ static void vgacon_set_cursor_size(int xpos, int from, int to)
         outb_p(curs, vga_video_port_val);
         outb_p(VGA_CRTC_CURSOR_END, vga_video_port_reg);
         outb_p(cure, vga_video_port_val);
-        spin_unlock_irqrestore(&vga_lock, flags);
+        raw_spin_unlock_irqrestore(&vga_lock, flags);
 }
 
 static void vgacon_cursor(struct vc_data *c, int mode)
@@ -757,7 +757,7 @@ static int vgacon_doresize(struct vc_data *c,
         unsigned int scanlines = height * c->vc_font.height;
         u8 scanlines_lo = 0, r7 = 0, vsync_end = 0, mode, max_scan;
 
-        spin_lock_irqsave(&vga_lock, flags);
+        raw_spin_lock_irqsave(&vga_lock, flags);
 
         vgacon_xres = width * VGA_FONTWIDTH;
         vgacon_yres = height * c->vc_font.height;
@@ -808,7 +808,7 @@ static int vgacon_doresize(struct vc_data *c,
                 outb_p(vsync_end, vga_video_port_val);
         }
 
-        spin_unlock_irqrestore(&vga_lock, flags);
+        raw_spin_unlock_irqrestore(&vga_lock, flags);
         return 0;
 }
 
@@ -891,11 +891,11 @@ static void vga_vesa_blank(struct vgastate *state, int mode)
 {
         /* save original values of VGA controller registers */
         if (!vga_vesa_blanked) {
-                spin_lock_irq(&vga_lock);
+                raw_spin_lock_irq(&vga_lock);
                 vga_state.SeqCtrlIndex = vga_r(state->vgabase, VGA_SEQ_I);
                 vga_state.CrtCtrlIndex = inb_p(vga_video_port_reg);
                 vga_state.CrtMiscIO = vga_r(state->vgabase, VGA_MIS_R);
-                spin_unlock_irq(&vga_lock);
+                raw_spin_unlock_irq(&vga_lock);
 
                 outb_p(0x00, vga_video_port_reg);       /* HorizontalTotal */
                 vga_state.HorizontalTotal = inb_p(vga_video_port_val);
@@ -918,7 +918,7 @@ static void vga_vesa_blank(struct vgastate *state, int mode)
 
         /* assure that video is enabled */
         /* "0x20" is VIDEO_ENABLE_bit in register 01 of sequencer */
-        spin_lock_irq(&vga_lock);
+        raw_spin_lock_irq(&vga_lock);
         vga_wseq(state->vgabase, VGA_SEQ_CLOCK_MODE, vga_state.ClockingMode | 0x20);
 
         /* test for vertical retrace in process.... */
@@ -954,13 +954,13 @@ static void vga_vesa_blank(struct vgastate *state, int mode)
         /* restore both index registers */
         vga_w(state->vgabase, VGA_SEQ_I, vga_state.SeqCtrlIndex);
         outb_p(vga_state.CrtCtrlIndex, vga_video_port_reg);
-        spin_unlock_irq(&vga_lock);
+        raw_spin_unlock_irq(&vga_lock);
 }
 
 static void vga_vesa_unblank(struct vgastate *state)
 {
         /* restore original values of VGA controller registers */
-        spin_lock_irq(&vga_lock);
+        raw_spin_lock_irq(&vga_lock);
         vga_w(state->vgabase, VGA_MIS_W, vga_state.CrtMiscIO);
 
         outb_p(0x00, vga_video_port_reg);       /* HorizontalTotal */
@@ -985,7 +985,7 @@ static void vga_vesa_unblank(struct vgastate *state)
         /* restore index/control registers */
         vga_w(state->vgabase, VGA_SEQ_I, vga_state.SeqCtrlIndex);
         outb_p(vga_state.CrtCtrlIndex, vga_video_port_reg);
-        spin_unlock_irq(&vga_lock);
+        raw_spin_unlock_irq(&vga_lock);
 }
 
 static void vga_pal_blank(struct vgastate *state)
@@ -1104,7 +1104,7 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
                 charmap += 4 * cmapsz;
 #endif
 
-        spin_lock_irq(&vga_lock);
+        raw_spin_lock_irq(&vga_lock);
         /* First, the Sequencer */
         vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x1);
         /* CPU writes only to map 2 */
@@ -1120,7 +1120,7 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
         vga_wgfx(state->vgabase, VGA_GFX_MODE, 0x00);
         /* map start at A000:0000 */
         vga_wgfx(state->vgabase, VGA_GFX_MISC, 0x00);
-        spin_unlock_irq(&vga_lock);
+        raw_spin_unlock_irq(&vga_lock);
 
         if (arg) {
                 if (set)
@@ -1147,7 +1147,7 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
                 }
         }
 
-        spin_lock_irq(&vga_lock);
+        raw_spin_lock_irq(&vga_lock);
         /* First, the sequencer, Synchronous reset */
         vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x01);  
         /* CPU writes to maps 0 and 1 */
@@ -1186,7 +1186,7 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
                 inb_p(video_port_status);
                 vga_wattr(state->vgabase, VGA_AR_ENABLE_DISPLAY, 0);    
         }
-        spin_unlock_irq(&vga_lock);
+        raw_spin_unlock_irq(&vga_lock);
         return 0;
 }
 
@@ -1211,26 +1211,26 @@ static int vgacon_adjust_height(struct vc_data *vc, unsigned fontheight)
            registers; they are write-only on EGA, but it appears that they
            are all don't care bits on EGA, so I guess it doesn't matter. */
 
-        spin_lock_irq(&vga_lock);
+        raw_spin_lock_irq(&vga_lock);
         outb_p(0x07, vga_video_port_reg);       /* CRTC overflow register */
         ovr = inb_p(vga_video_port_val);
         outb_p(0x09, vga_video_port_reg);       /* Font size register */
         fsr = inb_p(vga_video_port_val);
-        spin_unlock_irq(&vga_lock);
+        raw_spin_unlock_irq(&vga_lock);
 
         vde = maxscan & 0xff;   /* Vertical display end reg */
         ovr = (ovr & 0xbd) +    /* Overflow register */
             ((maxscan & 0x100) >> 7) + ((maxscan & 0x200) >> 3);
         fsr = (fsr & 0xe0) + (fontheight - 1);  /*  Font size register */
 
-        spin_lock_irq(&vga_lock);
+        raw_spin_lock_irq(&vga_lock);
         outb_p(0x07, vga_video_port_reg);       /* CRTC overflow register */
         outb_p(ovr, vga_video_port_val);
         outb_p(0x09, vga_video_port_reg);       /* Font size */
         outb_p(fsr, vga_video_port_val);
         outb_p(0x12, vga_video_port_reg);       /* Vertical display limit */
         outb_p(vde, vga_video_port_val);
-        spin_unlock_irq(&vga_lock);
+        raw_spin_unlock_irq(&vga_lock);
         vga_video_font_height = fontheight;
 
         for (i = 0; i < MAX_NR_CONSOLES; i++) {