summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2006-02-02 04:20:43 +0000
committerGuillem Jover <guillem@debian.org>2006-02-02 04:20:43 +0000
commit88f47da9bee3cdd5cebe4398d3ce3500ec0348de (patch)
tree97b33111faaa667dbcb80a3a455e45e378477da5 /debian
parente09f73b045d4b8b3b5d33fd179e88493e2d1b0f7 (diff)
Fix hunks.
Add patch file to changelog.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/42_disable_ioperm.patch2
-rw-r--r--debian/patches/50_mem_limit.patch2
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f0579e2..6f279c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ gnumach (1:20060201-1) UNRELEASED; urgency=low
- debian/patches/45_io_per_task.patch: Likewise.
- debian/patches/90_autoconf_autogen.patch: Likewise.
* Fix -H kernel command line argument to halt on panic. (Closes: #184624)
+ - debian/patches/05_halt_on_panic_flag.patch: New file.
Thanks to Soeren D. Schulze <soeren.d.schulze@gmx.de>.
* Do not allow PCI IRQ's higher than 16.
- debian/patches/patches/24_pci_irq_fix.patch: New file.
diff --git a/debian/patches/42_disable_ioperm.patch b/debian/patches/42_disable_ioperm.patch
index 1bb6768..bab5914 100644
--- a/debian/patches/42_disable_ioperm.patch
+++ b/debian/patches/42_disable_ioperm.patch
@@ -21,7 +21,7 @@
return ts;
}
-@@ -357,7 +362,7 @@
+@@ -358,7 +363,7 @@
simple_unlock(&iopb_lock);
new_io_tss = (iopb_tss_t) kalloc(sizeof(struct iopb_tss));
diff --git a/debian/patches/50_mem_limit.patch b/debian/patches/50_mem_limit.patch
index 58dd088..ba744a8 100644
--- a/debian/patches/50_mem_limit.patch
+++ b/debian/patches/50_mem_limit.patch
@@ -14,7 +14,7 @@
diff -upr gnumach-20050801/i386/i386at/model_dep.c gnumach-mine/i386/i386at/model_dep.c
--- gnumach-20050801/i386/i386at/model_dep.c 2004-11-29 06:34:51.000000000 +0100
+++ gnumach-mine/i386/i386at/model_dep.c 2006-01-09 00:07:46.000000000 +0100
-@@ -226,6 +226,11 @@ mem_size_init()
+@@ -230,6 +230,11 @@ mem_size_init()
/* This is actually enforced below, in init_alloc_aligned. */
}