diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-05-03 02:09:26 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-05-03 02:09:26 +0200 |
| commit | bef3332af519949b172f6962889d738d1b306c45 (patch) | |
| tree | 1117853cf10f0244c0e377396683ccafd92088e1 | |
| parent | e9068431f0d23ea835dd12fc4e30093f92534bec (diff) | |
update acpihalt.patch
| -rw-r--r-- | debian/patches/acpihalt.patch | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/debian/patches/acpihalt.patch b/debian/patches/acpihalt.patch index e914672..68f5fd4 100644 --- a/debian/patches/acpihalt.patch +++ b/debian/patches/acpihalt.patch @@ -1,15 +1,3 @@ -diff --git a/ddb/db_command.c b/ddb/db_command.c -index ebb13df..8171119 100644 ---- a/ddb/db_command.c -+++ b/ddb/db_command.c -@@ -363,6 +363,7 @@ struct db_command db_command_table[] = { - { "show", 0, 0, db_show_cmds }, - { "reset", db_reset_cpu, 0, 0 }, - { "reboot", db_reset_cpu, 0, 0 }, -+ { "halt", db_halt_cpu, 0, 0 }, - { (char *)0, } - }; - diff --git a/i386/Makefrag.am b/i386/Makefrag.am index cac2267..4dd6a9f 100644 --- a/i386/Makefrag.am @@ -1712,19 +1700,6 @@ index 0000000..79f765c +#define GRUB_CHAR_BIT 8 + +#endif /* ! GRUB_TYPES_HEADER */ -diff --git a/i386/i386/db_interface.h b/i386/i386/db_interface.h -index 97ff5c7..8d7daea 100644 ---- a/i386/i386/db_interface.h -+++ b/i386/i386/db_interface.h -@@ -98,6 +98,8 @@ db_stack_trace_cmd( - const char *modif); - - extern void -+db_halt_cpu(void); -+extern void - db_reset_cpu(void); - - void diff --git a/i386/i386/io_map.c b/i386/i386/io_map.c index 74e0b47..03d7152 100644 --- a/i386/i386/io_map.c @@ -2368,7 +2343,7 @@ index 0000000..68a4cb1 + return ret; +} diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c -index 7d138be..6093a66 100644 +index 95752fa..6093a66 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -69,6 +69,7 @@ @@ -2387,15 +2362,3 @@ index 7d138be..6093a66 100644 printf("In tight loop: hit ctl-alt-del to reboot\n"); (void) spl0(); } -@@ -243,6 +245,11 @@ void exit(int rc) - halt_all_cpus(0); - } - -+void db_halt_cpu(void) -+{ -+ halt_all_cpus(0); -+} -+ - void db_reset_cpu(void) - { - halt_all_cpus(1); |