Merge misc patches from Andrew Morton: - Florian has vanished so I appear to have become fbdev maintainer again :( - Joel and Mark are distracted to welcome to the new OCFS2 maintainer - The backlight queue - Small core kernel changes - lib/ updates - The rtc queue - Various random bits * akpm: (164 commits) rtc: rtc-davinci: use devm_*() functions rtc: rtc-max8997: use devm_request_threaded_irq() rtc: rtc-max8907: use devm_request_threaded_irq() rtc: rtc-da9052: use devm_request_threaded_irq() rtc: rtc-wm831x: use devm_request_threaded_irq() rtc: rtc-tps80031: use devm_request_threaded_irq() rtc: rtc-lp8788: use devm_request_threaded_irq() rtc: rtc-coh901331: use devm_clk_get() rtc: rtc-vt8500: use devm_*() functions rtc: rtc-tps6586x: use devm_request_threaded_irq() rtc: rtc-imxdi: use devm_clk_get() rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug() rtc: rtc-pcf8583: use dev_warn() instead of printk() rtc: rtc-sun4v: use pr_warn() instead of printk() rtc: rtc-vr41xx: use dev_info() instead of printk() rtc: rtc-rs5c313: use pr_err() instead of printk() rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug() rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug() rtc: rtc-ds2404: use dev_err() instead of printk() rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk() ...
Showing the changes to include/uapi (2 of 165 files). Show all
Unified · Split
| @@ -49,14 +49,14 @@ typedef __s64 Elf64_Sxword; · 48 unmodified lines | ||
| 49 | 49 | * |
| 50 | 50 | * Specifications are available in: |
| 51 | 51 | * |
| 52 | − * - Sun microsystems: Linker and Libraries. | |
| 53 | − * Part No: 817-1984-17, September 2008. | |
| 54 | − * URL: http://docs.sun.com/app/docs/doc/817-1984 | |
| 52 | + * - Oracle: Linker and Libraries. | |
| 53 | + * Part No: 817–1984–19, August 2011. | |
| 54 | + * http://docs.oracle.com/cd/E18752_01/pdf/817-1984.pdf | |
| 55 | 55 | * |
| 56 | 56 | * - System V ABI AMD64 Architecture Processor Supplement |
| 57 | − * Draft Version 0.99., | |
| 58 | − * May 11, 2009. | |
| 59 | − * URL: http://www.x86-64.org/ | |
| 57 | + * Draft Version 0.99.4, | |
| 58 | + * January 13, 2010. | |
| 59 | + * http://www.cs.washington.edu/education/courses/cse351/12wi/supp-docs/abi.pdf | |
| 60 | 60 | */ |
| 61 | 61 | #define PN_XNUM 0xffff |
| 62 | 62 | |
| @@ -86,6 +86,9 @@ struct inodes_stat_t { · 85 unmodified lines | ||
| 86 | 86 | #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ |
| 87 | 87 | #define MS_I_VERSION (1<<23) /* Update inode I_version field */ |
| 88 | 88 | #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ |
| 89 | + | |
| 90 | +/* These sb flags are internal to the kernel */ | |
| 91 | +#define MS_SNAP_STABLE (1<<27) /* Snapshot pages during writeback, if needed */ | |
| 89 | 92 | #define MS_NOSEC (1<<28) |
| 90 | 93 | #define MS_BORN (1<<29) |
| 91 | 94 | #define MS_ACTIVE (1<<30) |