Merge branch 'linus' into stackprotector

Conflicts:
	arch/x86/include/asm/pda.h
	kernel/fork.c

1 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 07a9b52a2654..346e2b80be7d 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -61,7 +61,7 @@ extern u8 journal_enable_debug;
         do {                                                            \
                 if ((n) <= journal_enable_debug) {                      \
                         printk (KERN_DEBUG "(%s, %d): %s: ",            \
-                                __FILE__, __LINE__, __FUNCTION__);      \
+                                __FILE__, __LINE__, __func__);  \
                         printk (f, ## a);                               \
                 }                                                       \
         } while (0)
@@ -816,6 +816,9 @@ struct journal_s
 #define JFS_FLUSHED     0x008   /* The journal superblock has been flushed */
 #define JFS_LOADED      0x010   /* The journal superblock has been loaded */
 #define JFS_BARRIER     0x020   /* Use IDE barriers */
+#define JFS_ABORT_ON_SYNCDATA_ERR       0x040  /* Abort the journal on file
+                                                * data write error in ordered
+                                                * mode */
 
 /*
  * Function declarations for the journaling transaction and buffer
@@ -908,7 +911,7 @@ extern int	   journal_set_features
                    (journal_t *, unsigned long, unsigned long, unsigned long);
 extern int         journal_create     (journal_t *);
 extern int         journal_load       (journal_t *journal);
-extern void        journal_destroy    (journal_t *);
+extern int         journal_destroy    (journal_t *);
 extern int         journal_recover    (journal_t *journal);
 extern int         journal_wipe       (journal_t *, int);
 extern int         journal_skip_recovery        (journal_t *);
@@ -984,7 +987,7 @@ extern int	cleanup_journal_tail(journal_t *);
 
 #define jbd_ENOSYS() \
 do {                                                                       \
-        printk (KERN_ERR "JBD unimplemented function %s\n", __FUNCTION__); \
+        printk (KERN_ERR "JBD unimplemented function %s\n", __func__); \
         current->state = TASK_UNINTERRUPTIBLE;                             \
         schedule();                                                        \
 } while (1)