Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1001-2.6.25-xen-squashfs-Fix-build-without-CONFIG_SMP.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (show annotations) (download)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 816 byte(s)
-ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2

1 From 24663fc99eefba308fdb0f4cb191f7cea7253ca0 Mon Sep 17 00:00:00 2001
2 From: Mark McLoughlin <markmc@redhat.com>
3 Date: Wed, 5 Mar 2008 12:50:50 +0000
4 Subject: [PATCH] squashfs: Fix build without CONFIG_SMP
5
6 wait_event() needs various definitions from <linux/sched.h>
7
8 With CONFIG_SMP, <linux/smp_lock.h> pulls in <linux/sched.h>,
9 but without CONFIG_SMP it fails to build.
10
11 Signed-off-by: Mark McLoughlin <markmc@redhat.com>
12 ---
13 fs/squashfs/inode.c | 1 +
14 1 files changed, 1 insertions(+), 0 deletions(-)
15
16 diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c
17 index f578528..f5829f2 100644
18 --- a/fs/squashfs/inode.c
19 +++ b/fs/squashfs/inode.c
20 @@ -32,6 +32,7 @@
21 #include <linux/vmalloc.h>
22 #include <linux/smp_lock.h>
23 #include <linux/exportfs.h>
24 +#include <linux/sched.h>
25
26 #include "squashfs.h"
27
28 --
29 1.5.4.1
30