vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/commands/i386/pc/halt.c (grub_halt): Add noreturn attribute.

Browse source 
(grub_cmd_halt): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 15:06:39 +01:00
parent bea359d657
commit 6fd4e6e4d0
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/i386/pc/halt.c (grub_halt): Add noreturn attribute.
(grub_cmd_halt): Likewise.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/i386/relocator16.S: Declare LOCAL(relocator16_end) * grub-core/lib/i386/relocator16.S: Declare LOCAL(relocator16_end)

5
grub-core/commands/i386/pc/halt.c
View file

@ -44,7 +44,7 @@ stop (void)
* Halt the system, using APM if possible. If NO_APM is true, don't use * Halt the system, using APM if possible. If NO_APM is true, don't use
* APM even if it is available. * APM even if it is available.
*/ */
void void __attribute__ ((noreturn))
grub_halt (int no_apm) grub_halt (int no_apm)
{ {
struct grub_bios_int_registers regs; struct grub_bios_int_registers regs;
@ -97,7 +97,7 @@ grub_halt (int no_apm)
stop (); stop ();
} }
static grub_err_t static grub_err_t __attribute__ ((noreturn))
grub_cmd_halt (grub_extcmd_context_t ctxt, grub_cmd_halt (grub_extcmd_context_t ctxt,
int argc __attribute__ ((unused)), int argc __attribute__ ((unused)),
char **args __attribute__ ((unused))) char **args __attribute__ ((unused)))
@ -109,7 +109,6 @@ grub_cmd_halt (grub_extcmd_context_t ctxt,
if (state[0].set) if (state[0].set)
no_apm = 1; no_apm = 1;
grub_halt (no_apm); grub_halt (no_apm);
return 0;
} }
static grub_extcmd_t cmd; static grub_extcmd_t cmd;