diff options
| author | Toomas Soome <tsoome@me.com> | 2017-08-18 12:36:36 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2017-09-21 12:36:51 -0400 |
| commit | 5f82aa32fbc5dc2c59bca6ff315f44a4c4c9ea86 (patch) | |
| tree | 543087f5d3c82178e644d9e544ef9c1498618fb6 /usr/src/grub | |
| parent | d042c5a26452797afc4fe8c2ceddebff94d88745 (diff) | |
| download | illumos-joyent-5f82aa32fbc5dc2c59bca6ff315f44a4c4c9ea86.tar.gz | |
8595 sys/ccompile.h: add __aligned and __packed
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Approved by: Dan McDonald <danmcd@joyent.com>
8596 iwn: remove local __packed
Reviewed by: Vitaliy Gusev <gusev.vitaliy@icloud.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
8597 grub: use __aligned from ccompile.h
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/grub-0.97/netboot/nic.c | 2 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/netboot/osdep.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/grub/grub-0.97/netboot/nic.c b/usr/src/grub/grub-0.97/netboot/nic.c index 23b8d59fc8..c2b025b51a 100644 --- a/usr/src/grub/grub-0.97/netboot/nic.c +++ b/usr/src/grub/grub-0.97/netboot/nic.c @@ -117,7 +117,7 @@ static int dummy(void *unused __unused) * leaving the ethernet data 16 byte aligned. Beyond this * we use memmove but this makes the common cast simple and fast. */ -static char packet[ETH_FRAME_LEN + ETH_DATA_ALIGN] __aligned; +static char packet[ETH_FRAME_LEN + ETH_DATA_ALIGN] __aligned(16); struct nic nic = { diff --git a/usr/src/grub/grub-0.97/netboot/osdep.h b/usr/src/grub/grub-0.97/netboot/osdep.h index 03b8981d82..58925fedc7 100644 --- a/usr/src/grub/grub-0.97/netboot/osdep.h +++ b/usr/src/grub/grub-0.97/netboot/osdep.h @@ -2,7 +2,6 @@ #define _OSDEP_H #define __unused __attribute__((unused)) -#define __aligned __attribute__((aligned(16))) #include "io.h" #include "byteswap.h" |