Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 10 deletions

diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 37173fa07d15..9229e5514a4e 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -321,7 +321,7 @@ static int show_journal(struct seq_file *m, struct super_block *sb)
                    /* incore fields */
                    "j_1st_reserved_block: \t%i\n"
                    "j_state: \t%li\n"
-                   "j_trans_id: \t%lu\n"
+                   "j_trans_id: \t%u\n"
                    "j_mount_id: \t%lu\n"
                    "j_start: \t%lu\n"
                    "j_len: \t%lu\n"
@@ -329,7 +329,7 @@ static int show_journal(struct seq_file *m, struct super_block *sb)
                    "j_wcount: \t%i\n"
                    "j_bcount: \t%lu\n"
                    "j_first_unflushed_offset: \t%lu\n"
-                   "j_last_flush_trans_id: \t%lu\n"
+                   "j_last_flush_trans_id: \t%u\n"
                    "j_trans_start_time: \t%li\n"
                    "j_list_bitmap_index: \t%i\n"
                    "j_must_wait: \t%i\n"
@@ -492,7 +492,6 @@ int reiserfs_proc_info_init(struct super_block *sb)
         spin_lock_init(&__PINFO(sb).lock);
         REISERFS_SB(sb)->procdir = proc_mkdir(b, proc_info_root);
         if (REISERFS_SB(sb)->procdir) {
-                REISERFS_SB(sb)->procdir->owner = THIS_MODULE;
                 REISERFS_SB(sb)->procdir->data = sb;
                 add_file(sb, "version", show_version);
                 add_file(sb, "super", show_super);
@@ -503,7 +502,7 @@ int reiserfs_proc_info_init(struct super_block *sb)
                 add_file(sb, "journal", show_journal);
                 return 0;
         }
-        reiserfs_warning(sb, "reiserfs: cannot create /proc/%s/%s",
+        reiserfs_warning(sb, "cannot create /proc/%s/%s",
                          proc_info_root_name, b);
         return 1;
 }
@@ -556,11 +555,8 @@ int reiserfs_proc_info_global_init(void)
 {
         if (proc_info_root == NULL) {
                 proc_info_root = proc_mkdir(proc_info_root_name, NULL);
-                if (proc_info_root) {
-                        proc_info_root->owner = THIS_MODULE;
-                } else {
-                        reiserfs_warning(NULL,
-                                         "reiserfs: cannot create /proc/%s",
+                if (!proc_info_root) {
+                        reiserfs_warning(NULL, "cannot create /proc/%s",
                                          proc_info_root_name);
                         return 1;
                 }
@@ -634,7 +630,7 @@ int reiserfs_global_version_in_proc(char *buffer, char **start,
  *
  */
 
-/* 
+/*
  * Make Linus happy.
  * Local variables:
  * c-indentation-style: "K&R"