← Back to branch summary

~ubuntu-branches/ubuntu/hardy/qemu/hardy

« back to all changes in this revision

Viewing changes to linux-2.6.9-qemu-fast.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2007-05-02 11:55:16 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502115516-rf8z0ba1ojbncx10
Tags: 0.9.0-1ubuntu1
* merged from Debian/experimental
* Merge from debian unstable, remaining changes:
   - Remove 34_syscalls_types.patch from debian/patches/series: add an
     unnecessary kernel header breaking compilation of linux-user/syscall.c.
   - Move proll and openhackware from Depends to Recommends.
   - set Maintainer field to MOTU

Show diffs side-by-side

added added

removed removed

Lines of Context:
linux-2.6.9-qemu-fast.patch
1
 
--- linux-2.6.9/arch/i386/Kconfig       2004-10-18 23:53:22.000000000 +0200
2
 
+++ linux-2.6.9-qemu/arch/i386/Kconfig  2004-12-07 21:56:49.000000000 +0100
3
 
@@ -337,6 +337,14 @@ config X86_GENERIC
4
 
 
5
 
 endif
6
 
 
7
 
+config QEMU
8
 
+       bool "Kernel to run under QEMU"
9
 
+       depends on EXPERIMENTAL
10
 
+       help
11
 
+         Select this if you want to boot the kernel inside qemu-fast,
12
 
+         the non-mmu version of the x86 emulator.  See
13
 
+         <http://fabrice.bellard.free.fr/qemu/>.  Say N.
14
 
+
15
 
 #
16
 
 # Define implied options from the CPU selection here
17
 
 #
18
 
--- linux-2.6.9/include/asm-i386/fixmap.h       2004-10-18 23:53:08.000000000 +0200
19
 
+++ linux-2.6.9-qemu/include/asm-i386/fixmap.h  2004-12-07 23:16:11.000000000 +0100
20
 
@@ -20,7 +20,11 @@
21
 
  * Leave one empty page between vmalloc'ed areas and
22
 
  * the start of the fixmap.
23
 
  */
24
 
+#ifdef CONFIG_QEMU
25
 
+#define __FIXADDR_TOP   0xa7fff000
26
 
+#else
27
 
 #define __FIXADDR_TOP  0xfffff000
28
 
+#endif
29
 
 
30
 
 #ifndef __ASSEMBLY__
31
 
 #include <linux/kernel.h>
32
 
--- linux-2.6.9/include/asm-i386/page.h 2004-10-18 23:53:22.000000000 +0200
33
 
+++ linux-2.6.9-qemu/include/asm-i386/page.h    2004-12-07 21:56:49.000000000 +0100
34
 
@@ -121,12 +121,19 @@ extern int sysctl_legacy_va_layout;
35
 
 #endif /* __ASSEMBLY__ */
36
 
 
37
 
 #ifdef __ASSEMBLY__
38
 
+#ifdef CONFIG_QEMU
39
 
+#define __PAGE_OFFSET          (0x90000000)
40
 
+#else
41
 
 #define __PAGE_OFFSET          (0xC0000000)
42
 
+#endif /* QEMU */
43
 
+#else
44
 
+#ifdef CONFIG_QEMU
45
 
+#define __PAGE_OFFSET          (0x90000000UL)
46
 
 #else
47
 
 #define __PAGE_OFFSET          (0xC0000000UL)
48
 
+#endif /* QEMU */
49
 
 #endif
50
 
 
51
 
-
52
 
 #define PAGE_OFFSET            ((unsigned long)__PAGE_OFFSET)
53
 
 #define VMALLOC_RESERVE                ((unsigned long)__VMALLOC_RESERVE)
54
 
 #define MAXMEM                 (-__PAGE_OFFSET-__VMALLOC_RESERVE)
55
 
--- linux-2.6.9/include/asm-i386/param.h        2004-10-18 23:53:24.000000000 +0200
56
 
+++ linux-2.6.9-qemu/include/asm-i386/param.h   2004-12-07 21:56:49.000000000 +0100
57
 
@@ -2,7 +2,12 @@
58
 
 #define _ASMi386_PARAM_H
59
 
 
60
 
 #ifdef __KERNEL__
61
 
-# define HZ            1000            /* Internal kernel timer frequency */
62
 
+# include <linux/config.h>
63
 
+# ifdef CONFIG_QEMU
64
 
+#  define HZ           100
65
 
+# else
66
 
+#  define HZ           1000            /* Internal kernel timer frequency */
67
 
+# endif
68
 
 # define USER_HZ       100             /* .. some user interfaces are in "ticks" */
69
 
 # define CLOCKS_PER_SEC                (USER_HZ)       /* like times() */
70
 
 #endif