Merge reason: From: Alexander Graf <agraf@suse.de> "Just recently this really important patch got pulled into Linus' tree for 3.9: commit 1674400aaee5b466c595a8fc310488263ce888c7 Author: Anton Blanchard <anton <at> samba.org> Date: Tue Mar 12 01:51:51 2013 +0000 Without that commit, I can not boot my G5, thus I can't run automated tests on it against my queue. Could you please merge kvm/next against linus/master, so that I can base my trees against that?" * upstream/master: (653 commits) PCI: Use ROM images from firmware only if no other ROM source available sparc: remove unused "config BITS" sparc: delete "if !ULTRA_HAS_POPULATION_COUNT" KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798) KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797) KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796) arm64: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS arm64: Do not select GENERIC_HARDIRQS_NO_DEPRECATED inet: limit length of fragment queue hash table bucket lists qeth: Fix scatter-gather regression qeth: Fix invalid router settings handling qeth: delay feature trace sgy-cts1000: Remove __dev* attributes KVM: x86: fix deadlock in clock-in-progress request handling KVM: allow host header to be included even for !CONFIG_KVM hwmon: (lm75) Fix tcn75 prefix hwmon: (lm75.h) Update header inclusion MAINTAINERS: Remove Mark M. Hoffman xfs: ensure we capture IO errors correctly xfs: fix xfs_iomap_eof_prealloc_initial_size type ...
Showing the changes to include/uapi/linux (4 of 756 files). Show all
Unified · Split
| @@ -107,10 +107,12 @@ struct acct_v3 · 106 unmodified lines | ||
| 107 | 107 | #define ACORE 0x08 /* ... dumped core */ |
| 108 | 108 | #define AXSIG 0x10 /* ... was killed by a signal */ |
| 109 | 109 | |
| 110 | −#ifdef __BIG_ENDIAN | |
| 110 | +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) | |
| 111 | 111 | #define ACCT_BYTEORDER 0x80 /* accounting file is big endian */ |
| 112 | −#else | |
| 112 | +#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) | |
| 113 | 113 | #define ACCT_BYTEORDER 0x00 /* accounting file is little endian */ |
| 114 | +#else | |
| 115 | +#error unspecified endianness | |
| 114 | 116 | #endif |
| 115 | 117 | |
| 116 | 118 | #ifndef __KERNEL__ |
| @@ -62,9 +62,9 @@ struct io_event { · 61 unmodified lines | ||
| 62 | 62 | __s64 res2; /* secondary result */ |
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | −#if defined(__LITTLE_ENDIAN) | |
| 65 | +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) | |
| 66 | 66 | #define PADDED(x,y) x, y |
| 67 | −#elif defined(__BIG_ENDIAN) | |
| 67 | +#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) | |
| 68 | 68 | #define PADDED(x,y) y, x |
| 69 | 69 | #else |
| 70 | 70 | #error edit for your odd byteorder. |
| @@ -145,16 +145,18 @@ typedef struct mdp_superblock_s { · 144 unmodified lines | ||
| 145 | 145 | __u32 failed_disks; /* 4 Number of failed disks */ |
| 146 | 146 | __u32 spare_disks; /* 5 Number of spare disks */ |
| 147 | 147 | __u32 sb_csum; /* 6 checksum of the whole superblock */ |
| 148 | −#ifdef __BIG_ENDIAN | |
| 148 | +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) | |
| 149 | 149 | __u32 events_hi; /* 7 high-order of superblock update count */ |
| 150 | 150 | __u32 events_lo; /* 8 low-order of superblock update count */ |
| 151 | 151 | __u32 cp_events_hi; /* 9 high-order of checkpoint update count */ |
| 152 | 152 | __u32 cp_events_lo; /* 10 low-order of checkpoint update count */ |
| 153 | −#else | |
| 153 | +#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) | |
| 154 | 154 | __u32 events_lo; /* 7 low-order of superblock update count */ |
| 155 | 155 | __u32 events_hi; /* 8 high-order of superblock update count */ |
| 156 | 156 | __u32 cp_events_lo; /* 9 low-order of checkpoint update count */ |
| 157 | 157 | __u32 cp_events_hi; /* 10 high-order of checkpoint update count */ |
| 158 | +#else | |
| 159 | +#error unspecified endianness | |
| 158 | 160 | #endif |
| 159 | 161 | __u32 recovery_cp; /* 11 recovery checkpoint sector count */ |
| 160 | 162 | /* There are only valid for minor_version > 90 */ |
| @@ -51,7 +51,10 @@ · 50 unmodified lines | ||
| 51 | 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ |
| 52 | 52 | #define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */ |
| 53 | 53 | #define PORT_BRCM_TRUMANAGE 25 |
| 54 | −#define PORT_MAX_8250 25 /* max port ID */ | |
| 54 | +#define PORT_ALTR_16550_F32 26 /* Altera 16550 UART with 32 FIFOs */ | |
| 55 | +#define PORT_ALTR_16550_F64 27 /* Altera 16550 UART with 64 FIFOs */ | |
| 56 | +#define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */ | |
| 57 | +#define PORT_MAX_8250 28 /* max port ID */ | |
| 55 | 58 | |
| 56 | 59 | /* |
| 57 | 60 | * ARM specific type numbers. These are not currently guaranteed |