From 0bfd2ad1659af65b4ac5df6f74d9e751814e82c6 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Tue, 29 Jul 2008 15:21:19 -0500
Subject: [PATCH] --- yaml --- r: 108294 b: refs/heads/master c:
 cb980d9a3ec3d39e30e0a4c473df528c09e0dcf3 h: refs/heads/master v: v3

---
 [refs]                                                 |  2 +-
 trunk/fs/dlm/user.c                                    | 10 +++++++---
 .../h8300/include/asm => include/asm-h8300}/Kbuild     |  0
 .../h8300/include/asm => include/asm-h8300}/a.out.h    |  0
 .../h8300/include/asm => include/asm-h8300}/atomic.h   |  0
 .../h8300/include/asm => include/asm-h8300}/auxvec.h   |  0
 .../h8300/include/asm => include/asm-h8300}/bitops.h   |  0
 .../h8300/include/asm => include/asm-h8300}/bootinfo.h |  0
 .../h8300/include/asm => include/asm-h8300}/bug.h      |  0
 .../h8300/include/asm => include/asm-h8300}/bugs.h     |  0
 .../include/asm => include/asm-h8300}/byteorder.h      |  0
 .../h8300/include/asm => include/asm-h8300}/cache.h    |  0
 .../h8300/include/asm => include/asm-h8300}/cachectl.h |  0
 .../include/asm => include/asm-h8300}/cacheflush.h     |  0
 .../h8300/include/asm => include/asm-h8300}/checksum.h |  0
 .../h8300/include/asm => include/asm-h8300}/cputime.h  |  0
 .../h8300/include/asm => include/asm-h8300}/current.h  |  0
 .../h8300/include/asm => include/asm-h8300}/dbg.h      |  0
 .../h8300/include/asm => include/asm-h8300}/delay.h    |  0
 .../h8300/include/asm => include/asm-h8300}/device.h   |  0
 .../h8300/include/asm => include/asm-h8300}/div64.h    |  0
 .../h8300/include/asm => include/asm-h8300}/dma.h      |  0
 .../h8300/include/asm => include/asm-h8300}/elf.h      |  0
 .../asm => include/asm-h8300}/emergency-restart.h      |  0
 .../h8300/include/asm => include/asm-h8300}/errno.h    |  0
 .../{arch/h8300/include/asm => include/asm-h8300}/fb.h |  0
 .../h8300/include/asm => include/asm-h8300}/fcntl.h    |  0
 .../h8300/include/asm => include/asm-h8300}/flat.h     |  0
 .../h8300/include/asm => include/asm-h8300}/fpu.h      |  0
 .../h8300/include/asm => include/asm-h8300}/futex.h    |  0
 .../h8300/include/asm => include/asm-h8300}/gpio.h     |  0
 .../h8300/include/asm => include/asm-h8300}/hardirq.h  |  0
 .../h8300/include/asm => include/asm-h8300}/hw_irq.h   |  0
 .../{arch/h8300/include/asm => include/asm-h8300}/io.h |  0
 .../h8300/include/asm => include/asm-h8300}/ioctl.h    |  0
 .../h8300/include/asm => include/asm-h8300}/ioctls.h   |  0
 .../h8300/include/asm => include/asm-h8300}/ipcbuf.h   |  0
 .../h8300/include/asm => include/asm-h8300}/irq.h      |  0
 .../h8300/include/asm => include/asm-h8300}/irq_regs.h |  0
 .../h8300/include/asm => include/asm-h8300}/kdebug.h   |  0
 .../include/asm => include/asm-h8300}/kmap_types.h     |  0
 .../h8300/include/asm => include/asm-h8300}/linkage.h  |  0
 .../h8300/include/asm => include/asm-h8300}/local.h    |  0
 .../include/asm => include/asm-h8300}/mc146818rtc.h    |  0
 .../{arch/h8300/include/asm => include/asm-h8300}/md.h |  0
 .../h8300/include/asm => include/asm-h8300}/mman.h     |  0
 .../h8300/include/asm => include/asm-h8300}/mmu.h      |  0
 .../include/asm => include/asm-h8300}/mmu_context.h    |  0
 .../h8300/include/asm => include/asm-h8300}/module.h   |  0
 .../h8300/include/asm => include/asm-h8300}/msgbuf.h   |  0
 .../h8300/include/asm => include/asm-h8300}/mutex.h    |  0
 .../h8300/include/asm => include/asm-h8300}/page.h     |  0
 .../include/asm => include/asm-h8300}/page_offset.h    |  0
 .../h8300/include/asm => include/asm-h8300}/param.h    |  0
 .../h8300/include/asm => include/asm-h8300}/pci.h      |  0
 .../h8300/include/asm => include/asm-h8300}/percpu.h   |  0
 .../h8300/include/asm => include/asm-h8300}/pgalloc.h  |  0
 .../h8300/include/asm => include/asm-h8300}/pgtable.h  |  0
 .../h8300/include/asm => include/asm-h8300}/poll.h     |  0
 .../include/asm => include/asm-h8300}/posix_types.h    |  0
 .../include/asm => include/asm-h8300}/processor.h      |  0
 .../h8300/include/asm => include/asm-h8300}/ptrace.h   |  0
 .../h8300/include/asm => include/asm-h8300}/regs267x.h |  0
 .../h8300/include/asm => include/asm-h8300}/regs306x.h |  0
 .../h8300/include/asm => include/asm-h8300}/resource.h |  0
 .../include/asm => include/asm-h8300}/scatterlist.h    |  0
 .../h8300/include/asm => include/asm-h8300}/sections.h |  0
 .../h8300/include/asm => include/asm-h8300}/segment.h  |  0
 .../h8300/include/asm => include/asm-h8300}/sembuf.h   |  0
 .../h8300/include/asm => include/asm-h8300}/setup.h    |  0
 .../h8300/include/asm => include/asm-h8300}/sh_bios.h  |  0
 .../h8300/include/asm => include/asm-h8300}/shm.h      |  0
 .../h8300/include/asm => include/asm-h8300}/shmbuf.h   |  0
 .../h8300/include/asm => include/asm-h8300}/shmparam.h |  0
 .../include/asm => include/asm-h8300}/sigcontext.h     |  0
 .../h8300/include/asm => include/asm-h8300}/siginfo.h  |  0
 .../h8300/include/asm => include/asm-h8300}/signal.h   |  0
 .../h8300/include/asm => include/asm-h8300}/smp.h      |  0
 .../h8300/include/asm => include/asm-h8300}/socket.h   |  0
 .../h8300/include/asm => include/asm-h8300}/sockios.h  |  0
 .../h8300/include/asm => include/asm-h8300}/spinlock.h |  0
 .../h8300/include/asm => include/asm-h8300}/stat.h     |  0
 .../h8300/include/asm => include/asm-h8300}/statfs.h   |  0
 .../h8300/include/asm => include/asm-h8300}/string.h   |  0
 .../h8300/include/asm => include/asm-h8300}/system.h   |  0
 .../include/asm => include/asm-h8300}/target_time.h    |  0
 .../h8300/include/asm => include/asm-h8300}/termbits.h |  0
 .../h8300/include/asm => include/asm-h8300}/termios.h  |  0
 .../include/asm => include/asm-h8300}/thread_info.h    |  0
 .../h8300/include/asm => include/asm-h8300}/timex.h    |  0
 .../h8300/include/asm => include/asm-h8300}/tlb.h      |  0
 .../h8300/include/asm => include/asm-h8300}/tlbflush.h |  0
 .../h8300/include/asm => include/asm-h8300}/topology.h |  0
 .../h8300/include/asm => include/asm-h8300}/traps.h    |  0
 .../h8300/include/asm => include/asm-h8300}/types.h    |  0
 .../h8300/include/asm => include/asm-h8300}/uaccess.h  |  0
 .../h8300/include/asm => include/asm-h8300}/ucontext.h |  0
 .../include/asm => include/asm-h8300}/unaligned.h      |  0
 .../h8300/include/asm => include/asm-h8300}/unistd.h   |  0
 .../h8300/include/asm => include/asm-h8300}/user.h     |  0
 .../include/asm => include/asm-h8300}/virtconvert.h    |  0
 101 files changed, 8 insertions(+), 4 deletions(-)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/Kbuild (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/a.out.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/atomic.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/auxvec.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/bitops.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/bootinfo.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/bug.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/bugs.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/byteorder.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/cache.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/cachectl.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/cacheflush.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/checksum.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/cputime.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/current.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/dbg.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/delay.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/device.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/div64.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/dma.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/elf.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/emergency-restart.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/errno.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/fb.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/fcntl.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/flat.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/fpu.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/futex.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/gpio.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/hardirq.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/hw_irq.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/io.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/ioctl.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/ioctls.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/ipcbuf.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/irq.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/irq_regs.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/kdebug.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/kmap_types.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/linkage.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/local.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/mc146818rtc.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/md.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/mman.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/mmu.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/mmu_context.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/module.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/msgbuf.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/mutex.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/page.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/page_offset.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/param.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/pci.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/percpu.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/pgalloc.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/pgtable.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/poll.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/posix_types.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/processor.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/ptrace.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/regs267x.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/regs306x.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/resource.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/scatterlist.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/sections.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/segment.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/sembuf.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/setup.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/sh_bios.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/shm.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/shmbuf.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/shmparam.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/sigcontext.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/siginfo.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/signal.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/smp.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/socket.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/sockios.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/spinlock.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/stat.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/statfs.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/string.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/system.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/target_time.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/termbits.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/termios.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/thread_info.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/timex.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/tlb.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/tlbflush.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/topology.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/traps.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/types.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/uaccess.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/ucontext.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/unaligned.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/unistd.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/user.h (100%)
 rename trunk/{arch/h8300/include/asm => include/asm-h8300}/virtconvert.h (100%)

diff --git a/[refs] b/[refs]
index 92ae92c724ca..743a202eedfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 758db3f2118703a1e36374dae5d58bed963e7e0d
+refs/heads/master: cb980d9a3ec3d39e30e0a4c473df528c09e0dcf3
diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c
index 929e48ae7591..34f14a14fb4e 100644
--- a/trunk/fs/dlm/user.c
+++ b/trunk/fs/dlm/user.c
@@ -527,8 +527,10 @@ static ssize_t device_write(struct file *file, const char __user *buf,
 		k32buf = (struct dlm_write_request32 *)kbuf;
 		kbuf = kmalloc(count + 1 + (sizeof(struct dlm_write_request) -
 			       sizeof(struct dlm_write_request32)), GFP_KERNEL);
-		if (!kbuf)
+		if (!kbuf) {
+			kfree(k32buf);
 			return -ENOMEM;
+		}
 
 		if (proc)
 			set_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags);
@@ -539,8 +541,10 @@ static ssize_t device_write(struct file *file, const char __user *buf,
 
 	/* do we really need this? can a write happen after a close? */
 	if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) &&
-	    (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags)))
-		return -EINVAL;
+	    (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))) {
+		error = -EINVAL;
+		goto out_free;
+	}
 
 	sigfillset(&allsigs);
 	sigprocmask(SIG_BLOCK, &allsigs, &tmpsig);
diff --git a/trunk/arch/h8300/include/asm/Kbuild b/trunk/include/asm-h8300/Kbuild
similarity index 100%
rename from trunk/arch/h8300/include/asm/Kbuild
rename to trunk/include/asm-h8300/Kbuild
diff --git a/trunk/arch/h8300/include/asm/a.out.h b/trunk/include/asm-h8300/a.out.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/a.out.h
rename to trunk/include/asm-h8300/a.out.h
diff --git a/trunk/arch/h8300/include/asm/atomic.h b/trunk/include/asm-h8300/atomic.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/atomic.h
rename to trunk/include/asm-h8300/atomic.h
diff --git a/trunk/arch/h8300/include/asm/auxvec.h b/trunk/include/asm-h8300/auxvec.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/auxvec.h
rename to trunk/include/asm-h8300/auxvec.h
diff --git a/trunk/arch/h8300/include/asm/bitops.h b/trunk/include/asm-h8300/bitops.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/bitops.h
rename to trunk/include/asm-h8300/bitops.h
diff --git a/trunk/arch/h8300/include/asm/bootinfo.h b/trunk/include/asm-h8300/bootinfo.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/bootinfo.h
rename to trunk/include/asm-h8300/bootinfo.h
diff --git a/trunk/arch/h8300/include/asm/bug.h b/trunk/include/asm-h8300/bug.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/bug.h
rename to trunk/include/asm-h8300/bug.h
diff --git a/trunk/arch/h8300/include/asm/bugs.h b/trunk/include/asm-h8300/bugs.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/bugs.h
rename to trunk/include/asm-h8300/bugs.h
diff --git a/trunk/arch/h8300/include/asm/byteorder.h b/trunk/include/asm-h8300/byteorder.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/byteorder.h
rename to trunk/include/asm-h8300/byteorder.h
diff --git a/trunk/arch/h8300/include/asm/cache.h b/trunk/include/asm-h8300/cache.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/cache.h
rename to trunk/include/asm-h8300/cache.h
diff --git a/trunk/arch/h8300/include/asm/cachectl.h b/trunk/include/asm-h8300/cachectl.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/cachectl.h
rename to trunk/include/asm-h8300/cachectl.h
diff --git a/trunk/arch/h8300/include/asm/cacheflush.h b/trunk/include/asm-h8300/cacheflush.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/cacheflush.h
rename to trunk/include/asm-h8300/cacheflush.h
diff --git a/trunk/arch/h8300/include/asm/checksum.h b/trunk/include/asm-h8300/checksum.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/checksum.h
rename to trunk/include/asm-h8300/checksum.h
diff --git a/trunk/arch/h8300/include/asm/cputime.h b/trunk/include/asm-h8300/cputime.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/cputime.h
rename to trunk/include/asm-h8300/cputime.h
diff --git a/trunk/arch/h8300/include/asm/current.h b/trunk/include/asm-h8300/current.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/current.h
rename to trunk/include/asm-h8300/current.h
diff --git a/trunk/arch/h8300/include/asm/dbg.h b/trunk/include/asm-h8300/dbg.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/dbg.h
rename to trunk/include/asm-h8300/dbg.h
diff --git a/trunk/arch/h8300/include/asm/delay.h b/trunk/include/asm-h8300/delay.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/delay.h
rename to trunk/include/asm-h8300/delay.h
diff --git a/trunk/arch/h8300/include/asm/device.h b/trunk/include/asm-h8300/device.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/device.h
rename to trunk/include/asm-h8300/device.h
diff --git a/trunk/arch/h8300/include/asm/div64.h b/trunk/include/asm-h8300/div64.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/div64.h
rename to trunk/include/asm-h8300/div64.h
diff --git a/trunk/arch/h8300/include/asm/dma.h b/trunk/include/asm-h8300/dma.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/dma.h
rename to trunk/include/asm-h8300/dma.h
diff --git a/trunk/arch/h8300/include/asm/elf.h b/trunk/include/asm-h8300/elf.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/elf.h
rename to trunk/include/asm-h8300/elf.h
diff --git a/trunk/arch/h8300/include/asm/emergency-restart.h b/trunk/include/asm-h8300/emergency-restart.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/emergency-restart.h
rename to trunk/include/asm-h8300/emergency-restart.h
diff --git a/trunk/arch/h8300/include/asm/errno.h b/trunk/include/asm-h8300/errno.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/errno.h
rename to trunk/include/asm-h8300/errno.h
diff --git a/trunk/arch/h8300/include/asm/fb.h b/trunk/include/asm-h8300/fb.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/fb.h
rename to trunk/include/asm-h8300/fb.h
diff --git a/trunk/arch/h8300/include/asm/fcntl.h b/trunk/include/asm-h8300/fcntl.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/fcntl.h
rename to trunk/include/asm-h8300/fcntl.h
diff --git a/trunk/arch/h8300/include/asm/flat.h b/trunk/include/asm-h8300/flat.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/flat.h
rename to trunk/include/asm-h8300/flat.h
diff --git a/trunk/arch/h8300/include/asm/fpu.h b/trunk/include/asm-h8300/fpu.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/fpu.h
rename to trunk/include/asm-h8300/fpu.h
diff --git a/trunk/arch/h8300/include/asm/futex.h b/trunk/include/asm-h8300/futex.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/futex.h
rename to trunk/include/asm-h8300/futex.h
diff --git a/trunk/arch/h8300/include/asm/gpio.h b/trunk/include/asm-h8300/gpio.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/gpio.h
rename to trunk/include/asm-h8300/gpio.h
diff --git a/trunk/arch/h8300/include/asm/hardirq.h b/trunk/include/asm-h8300/hardirq.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/hardirq.h
rename to trunk/include/asm-h8300/hardirq.h
diff --git a/trunk/arch/h8300/include/asm/hw_irq.h b/trunk/include/asm-h8300/hw_irq.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/hw_irq.h
rename to trunk/include/asm-h8300/hw_irq.h
diff --git a/trunk/arch/h8300/include/asm/io.h b/trunk/include/asm-h8300/io.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/io.h
rename to trunk/include/asm-h8300/io.h
diff --git a/trunk/arch/h8300/include/asm/ioctl.h b/trunk/include/asm-h8300/ioctl.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/ioctl.h
rename to trunk/include/asm-h8300/ioctl.h
diff --git a/trunk/arch/h8300/include/asm/ioctls.h b/trunk/include/asm-h8300/ioctls.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/ioctls.h
rename to trunk/include/asm-h8300/ioctls.h
diff --git a/trunk/arch/h8300/include/asm/ipcbuf.h b/trunk/include/asm-h8300/ipcbuf.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/ipcbuf.h
rename to trunk/include/asm-h8300/ipcbuf.h
diff --git a/trunk/arch/h8300/include/asm/irq.h b/trunk/include/asm-h8300/irq.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/irq.h
rename to trunk/include/asm-h8300/irq.h
diff --git a/trunk/arch/h8300/include/asm/irq_regs.h b/trunk/include/asm-h8300/irq_regs.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/irq_regs.h
rename to trunk/include/asm-h8300/irq_regs.h
diff --git a/trunk/arch/h8300/include/asm/kdebug.h b/trunk/include/asm-h8300/kdebug.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/kdebug.h
rename to trunk/include/asm-h8300/kdebug.h
diff --git a/trunk/arch/h8300/include/asm/kmap_types.h b/trunk/include/asm-h8300/kmap_types.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/kmap_types.h
rename to trunk/include/asm-h8300/kmap_types.h
diff --git a/trunk/arch/h8300/include/asm/linkage.h b/trunk/include/asm-h8300/linkage.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/linkage.h
rename to trunk/include/asm-h8300/linkage.h
diff --git a/trunk/arch/h8300/include/asm/local.h b/trunk/include/asm-h8300/local.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/local.h
rename to trunk/include/asm-h8300/local.h
diff --git a/trunk/arch/h8300/include/asm/mc146818rtc.h b/trunk/include/asm-h8300/mc146818rtc.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/mc146818rtc.h
rename to trunk/include/asm-h8300/mc146818rtc.h
diff --git a/trunk/arch/h8300/include/asm/md.h b/trunk/include/asm-h8300/md.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/md.h
rename to trunk/include/asm-h8300/md.h
diff --git a/trunk/arch/h8300/include/asm/mman.h b/trunk/include/asm-h8300/mman.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/mman.h
rename to trunk/include/asm-h8300/mman.h
diff --git a/trunk/arch/h8300/include/asm/mmu.h b/trunk/include/asm-h8300/mmu.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/mmu.h
rename to trunk/include/asm-h8300/mmu.h
diff --git a/trunk/arch/h8300/include/asm/mmu_context.h b/trunk/include/asm-h8300/mmu_context.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/mmu_context.h
rename to trunk/include/asm-h8300/mmu_context.h
diff --git a/trunk/arch/h8300/include/asm/module.h b/trunk/include/asm-h8300/module.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/module.h
rename to trunk/include/asm-h8300/module.h
diff --git a/trunk/arch/h8300/include/asm/msgbuf.h b/trunk/include/asm-h8300/msgbuf.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/msgbuf.h
rename to trunk/include/asm-h8300/msgbuf.h
diff --git a/trunk/arch/h8300/include/asm/mutex.h b/trunk/include/asm-h8300/mutex.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/mutex.h
rename to trunk/include/asm-h8300/mutex.h
diff --git a/trunk/arch/h8300/include/asm/page.h b/trunk/include/asm-h8300/page.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/page.h
rename to trunk/include/asm-h8300/page.h
diff --git a/trunk/arch/h8300/include/asm/page_offset.h b/trunk/include/asm-h8300/page_offset.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/page_offset.h
rename to trunk/include/asm-h8300/page_offset.h
diff --git a/trunk/arch/h8300/include/asm/param.h b/trunk/include/asm-h8300/param.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/param.h
rename to trunk/include/asm-h8300/param.h
diff --git a/trunk/arch/h8300/include/asm/pci.h b/trunk/include/asm-h8300/pci.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/pci.h
rename to trunk/include/asm-h8300/pci.h
diff --git a/trunk/arch/h8300/include/asm/percpu.h b/trunk/include/asm-h8300/percpu.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/percpu.h
rename to trunk/include/asm-h8300/percpu.h
diff --git a/trunk/arch/h8300/include/asm/pgalloc.h b/trunk/include/asm-h8300/pgalloc.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/pgalloc.h
rename to trunk/include/asm-h8300/pgalloc.h
diff --git a/trunk/arch/h8300/include/asm/pgtable.h b/trunk/include/asm-h8300/pgtable.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/pgtable.h
rename to trunk/include/asm-h8300/pgtable.h
diff --git a/trunk/arch/h8300/include/asm/poll.h b/trunk/include/asm-h8300/poll.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/poll.h
rename to trunk/include/asm-h8300/poll.h
diff --git a/trunk/arch/h8300/include/asm/posix_types.h b/trunk/include/asm-h8300/posix_types.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/posix_types.h
rename to trunk/include/asm-h8300/posix_types.h
diff --git a/trunk/arch/h8300/include/asm/processor.h b/trunk/include/asm-h8300/processor.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/processor.h
rename to trunk/include/asm-h8300/processor.h
diff --git a/trunk/arch/h8300/include/asm/ptrace.h b/trunk/include/asm-h8300/ptrace.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/ptrace.h
rename to trunk/include/asm-h8300/ptrace.h
diff --git a/trunk/arch/h8300/include/asm/regs267x.h b/trunk/include/asm-h8300/regs267x.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/regs267x.h
rename to trunk/include/asm-h8300/regs267x.h
diff --git a/trunk/arch/h8300/include/asm/regs306x.h b/trunk/include/asm-h8300/regs306x.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/regs306x.h
rename to trunk/include/asm-h8300/regs306x.h
diff --git a/trunk/arch/h8300/include/asm/resource.h b/trunk/include/asm-h8300/resource.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/resource.h
rename to trunk/include/asm-h8300/resource.h
diff --git a/trunk/arch/h8300/include/asm/scatterlist.h b/trunk/include/asm-h8300/scatterlist.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/scatterlist.h
rename to trunk/include/asm-h8300/scatterlist.h
diff --git a/trunk/arch/h8300/include/asm/sections.h b/trunk/include/asm-h8300/sections.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/sections.h
rename to trunk/include/asm-h8300/sections.h
diff --git a/trunk/arch/h8300/include/asm/segment.h b/trunk/include/asm-h8300/segment.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/segment.h
rename to trunk/include/asm-h8300/segment.h
diff --git a/trunk/arch/h8300/include/asm/sembuf.h b/trunk/include/asm-h8300/sembuf.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/sembuf.h
rename to trunk/include/asm-h8300/sembuf.h
diff --git a/trunk/arch/h8300/include/asm/setup.h b/trunk/include/asm-h8300/setup.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/setup.h
rename to trunk/include/asm-h8300/setup.h
diff --git a/trunk/arch/h8300/include/asm/sh_bios.h b/trunk/include/asm-h8300/sh_bios.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/sh_bios.h
rename to trunk/include/asm-h8300/sh_bios.h
diff --git a/trunk/arch/h8300/include/asm/shm.h b/trunk/include/asm-h8300/shm.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/shm.h
rename to trunk/include/asm-h8300/shm.h
diff --git a/trunk/arch/h8300/include/asm/shmbuf.h b/trunk/include/asm-h8300/shmbuf.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/shmbuf.h
rename to trunk/include/asm-h8300/shmbuf.h
diff --git a/trunk/arch/h8300/include/asm/shmparam.h b/trunk/include/asm-h8300/shmparam.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/shmparam.h
rename to trunk/include/asm-h8300/shmparam.h
diff --git a/trunk/arch/h8300/include/asm/sigcontext.h b/trunk/include/asm-h8300/sigcontext.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/sigcontext.h
rename to trunk/include/asm-h8300/sigcontext.h
diff --git a/trunk/arch/h8300/include/asm/siginfo.h b/trunk/include/asm-h8300/siginfo.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/siginfo.h
rename to trunk/include/asm-h8300/siginfo.h
diff --git a/trunk/arch/h8300/include/asm/signal.h b/trunk/include/asm-h8300/signal.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/signal.h
rename to trunk/include/asm-h8300/signal.h
diff --git a/trunk/arch/h8300/include/asm/smp.h b/trunk/include/asm-h8300/smp.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/smp.h
rename to trunk/include/asm-h8300/smp.h
diff --git a/trunk/arch/h8300/include/asm/socket.h b/trunk/include/asm-h8300/socket.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/socket.h
rename to trunk/include/asm-h8300/socket.h
diff --git a/trunk/arch/h8300/include/asm/sockios.h b/trunk/include/asm-h8300/sockios.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/sockios.h
rename to trunk/include/asm-h8300/sockios.h
diff --git a/trunk/arch/h8300/include/asm/spinlock.h b/trunk/include/asm-h8300/spinlock.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/spinlock.h
rename to trunk/include/asm-h8300/spinlock.h
diff --git a/trunk/arch/h8300/include/asm/stat.h b/trunk/include/asm-h8300/stat.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/stat.h
rename to trunk/include/asm-h8300/stat.h
diff --git a/trunk/arch/h8300/include/asm/statfs.h b/trunk/include/asm-h8300/statfs.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/statfs.h
rename to trunk/include/asm-h8300/statfs.h
diff --git a/trunk/arch/h8300/include/asm/string.h b/trunk/include/asm-h8300/string.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/string.h
rename to trunk/include/asm-h8300/string.h
diff --git a/trunk/arch/h8300/include/asm/system.h b/trunk/include/asm-h8300/system.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/system.h
rename to trunk/include/asm-h8300/system.h
diff --git a/trunk/arch/h8300/include/asm/target_time.h b/trunk/include/asm-h8300/target_time.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/target_time.h
rename to trunk/include/asm-h8300/target_time.h
diff --git a/trunk/arch/h8300/include/asm/termbits.h b/trunk/include/asm-h8300/termbits.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/termbits.h
rename to trunk/include/asm-h8300/termbits.h
diff --git a/trunk/arch/h8300/include/asm/termios.h b/trunk/include/asm-h8300/termios.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/termios.h
rename to trunk/include/asm-h8300/termios.h
diff --git a/trunk/arch/h8300/include/asm/thread_info.h b/trunk/include/asm-h8300/thread_info.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/thread_info.h
rename to trunk/include/asm-h8300/thread_info.h
diff --git a/trunk/arch/h8300/include/asm/timex.h b/trunk/include/asm-h8300/timex.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/timex.h
rename to trunk/include/asm-h8300/timex.h
diff --git a/trunk/arch/h8300/include/asm/tlb.h b/trunk/include/asm-h8300/tlb.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/tlb.h
rename to trunk/include/asm-h8300/tlb.h
diff --git a/trunk/arch/h8300/include/asm/tlbflush.h b/trunk/include/asm-h8300/tlbflush.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/tlbflush.h
rename to trunk/include/asm-h8300/tlbflush.h
diff --git a/trunk/arch/h8300/include/asm/topology.h b/trunk/include/asm-h8300/topology.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/topology.h
rename to trunk/include/asm-h8300/topology.h
diff --git a/trunk/arch/h8300/include/asm/traps.h b/trunk/include/asm-h8300/traps.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/traps.h
rename to trunk/include/asm-h8300/traps.h
diff --git a/trunk/arch/h8300/include/asm/types.h b/trunk/include/asm-h8300/types.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/types.h
rename to trunk/include/asm-h8300/types.h
diff --git a/trunk/arch/h8300/include/asm/uaccess.h b/trunk/include/asm-h8300/uaccess.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/uaccess.h
rename to trunk/include/asm-h8300/uaccess.h
diff --git a/trunk/arch/h8300/include/asm/ucontext.h b/trunk/include/asm-h8300/ucontext.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/ucontext.h
rename to trunk/include/asm-h8300/ucontext.h
diff --git a/trunk/arch/h8300/include/asm/unaligned.h b/trunk/include/asm-h8300/unaligned.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/unaligned.h
rename to trunk/include/asm-h8300/unaligned.h
diff --git a/trunk/arch/h8300/include/asm/unistd.h b/trunk/include/asm-h8300/unistd.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/unistd.h
rename to trunk/include/asm-h8300/unistd.h
diff --git a/trunk/arch/h8300/include/asm/user.h b/trunk/include/asm-h8300/user.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/user.h
rename to trunk/include/asm-h8300/user.h
diff --git a/trunk/arch/h8300/include/asm/virtconvert.h b/trunk/include/asm-h8300/virtconvert.h
similarity index 100%
rename from trunk/arch/h8300/include/asm/virtconvert.h
rename to trunk/include/asm-h8300/virtconvert.h