← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/grub2/jaunty-proposed

« back to all changes in this revision

Viewing changes to loader/powerpc/ieee1275/multiboot2.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Millan
  • Date: 2008-01-28 00:01:11 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080128000111-qolpe0u4qkf0xccc
Tags: 1.95+20080128-1
http://bugs.debian.org/449135
http://bugs.debian.org/422729
http://bugs.debian.org/462449
* New CVS snapshot.
  - Fixes bogus CLAIM problems on Apple firmware.  (Closes: #449135, #422729)
  - grub-probe performs sanity checks to make sure our filesystem drivers
    are usable.  (Closes: #462449)
  - patches/disable_ata.diff: Remove.  ATA module isn't auto-loaded in
    rescue floppies now.
  - patches/disable_xfs.diff: Remove.  See above (about grub-probe).
* Bring back grub-emu; it can help a lot with debugging feedback.
  - control
  - rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
loader/powerpc/ieee1275/multiboot2.c
115
115
grub_mb2_arch_boot (grub_addr_t entry_addr, void *tags)
116
116
{
117
117
  kernel_entry_t entry = (kernel_entry_t) entry_addr;
 
118
#if defined(__powerpc__)
118
119
  entry (MULTIBOOT2_BOOTLOADER_MAGIC, tags, grub_ieee1275_entry_fn, 0, 0);
 
120
#elif defined(__i386__)
 
121
  grub_multiboot2_real_boot (entry, tags);
 
122
#else
 
123
#error
 
124
#endif
119
125
}