lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

Browse Source 
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  uml: Fix build breakage after slab.h changes
This commit is contained in:
Linus Torvalds
2010-04-22 11:15:33 -07:00
parent 1482338f62 7f3c1fa4c3
commit 36c48f8cc5
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/um/drivers/line.c
View File

@@ -6,6 +6,7 @@
#include "linux/irqreturn.h" #include "linux/irqreturn.h"
#include "linux/kd.h" #include "linux/kd.h"
#include "linux/sched.h" #include "linux/sched.h"
#include "linux/slab.h"
#include "chan_kern.h" #include "chan_kern.h"
#include "irq_kern.h" #include "irq_kern.h"
#include "irq_user.h" #include "irq_user.h"

1
arch/um/os-Linux/helper.c
View File

@@ -8,7 +8,6 @@
#include <errno.h> #include <errno.h>
#include <sched.h> #include <sched.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/slab.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "kern_constants.h" #include "kern_constants.h"