From: John Tsiombikas <nuclear@mutantstargoat.com>
Date: Tue, 16 May 2017 06:08:07 +0000 (+0300)
Subject: Merge branch 'master' of goat:git/vdummy
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vdummy;a=commitdiff_plain;h=1f8e4783af5e5ba3406af8d732c680179dedd0c3

Merge branch 'master' of goat:git/vdummy
---

1f8e4783af5e5ba3406af8d732c680179dedd0c3
diff --cc vdummy.c
index 565a6b8,a4d05b8..b434b6f
--- a/vdummy.c
+++ b/vdummy.c
@@@ -411,10 -414,9 +424,11 @@@ static int update_frame(int xsz, int ys
  static int gen_frame(void)
  {
  	struct buffer *buf = 0;
+ 	unsigned long flags;
  
 +	printk(KERN_INFO "vdummy: gen_frame\n");
 +
- 	spin_lock(&blist_lock);
+ 	spin_lock_irqsave(&blist_lock, flags);
  	if(buflist) {
  		buf = buflist;
  		buflist = buflist->next;