mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-12-01 08:49:52 +00:00
ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From edb37fb30bbc8a3b6bec67911c7200e4eb071127 Mon Sep 17 00:00:00 2001
|
|
From: phcoder <phcoder@sid.debian.laptop.phnet>
|
|
Date: Sun, 9 Jul 2017 20:58:31 +0200
|
|
Subject: [PATCH 044/206] ehci: Fix compilation for amd64
|
|
|
|
---
|
|
grub-core/bus/usb/ehci.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
|
|
index c772e76546e..7b7061f5335 100644
|
|
--- a/grub-core/bus/usb/ehci.c
|
|
+++ b/grub-core/bus/usb/ehci.c
|
|
@@ -504,8 +504,8 @@ grub_ehci_init_device (volatile void *regs)
|
|
#endif
|
|
|
|
grub_dprintf ("ehci",
|
|
- "EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
|
|
- (grub_addr_t) e->iobase_ehcc + caplen);
|
|
+ "EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llxx\n",
|
|
+ (unsigned long long) e->iobase_ehcc + caplen);
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
|
|
grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
|
|
@@ -696,8 +696,8 @@ grub_ehci_init_device (volatile void *regs)
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: OK at all\n");
|
|
|
|
grub_dprintf ("ehci",
|
|
- "EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
|
|
- (grub_addr_t) regs);
|
|
+ "EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llx\n",
|
|
+ (unsigned long long) regs);
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
|
|
grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
|
|
--
|
|
2.15.0
|
|
|