Merge master.kernel.org:/home/rmk/linux-2.6-arm (4fbca532) · Commits · 戴 / test

arch/arm/kernel/asm-offsets.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,8 @@ int main(void)
		DEFINE(MACHINFO_NAME, offsetof(struct machine_desc, name));
		DEFINE(MACHINFO_PHYSIO, offsetof(struct machine_desc, phys_io));
		DEFINE(MACHINFO_PGOFFIO, offsetof(struct machine_desc, io_pg_offst));
		BLANK();
		DEFINE(PROC_INFO_SZ, sizeof(struct proc_info_list));
		DEFINE(PROCINFO_INITFUNC, offsetof(struct proc_info_list, __cpu_flush));
		DEFINE(PROCINFO_MMUFLAGS, offsetof(struct proc_info_list, __cpu_mmu_flags));
		return 0;

+17 −6

Original line number	Diff line number	Diff line
		@@ -143,12 +143,23 @@ static struct dma_ops isa_dma_ops = {
		.residue = isa_get_dma_residue,
		};

		static struct resource dma_resources[] = {
		{ "dma1", 0x0000, 0x000f },
		{ "dma low page", 0x0080, 0x008f },
		{ "dma2", 0x00c0, 0x00df },
		{ "dma high page", 0x0480, 0x048f }
		};
		static struct resource dma_resources[] = { {
		.name = "dma1",
		.start = 0x0000,
		.end = 0x000f
		}, {
		.name = "dma low page",
		.start = 0x0080,
		.end = 0x008f
		}, {
		.name = "dma2",
		.start = 0x00c0,
		.end = 0x00df
		}, {
		.name = "dma high page",
		.start = 0x0480,
		.end = 0x048f
		} };

		void __init isa_init_dma(dma_t *dma)
		{

+1 −1

Original line number	Diff line number	Diff line
		@@ -311,7 +311,7 @@ void free_thread_info(struct thread_info *thread)
		struct thread_info_list *th = &get_cpu_var(thread_info_list);
		if (th->nr < EXTRA_TASK_STRUCT) {
		unsigned long p = (unsigned long )thread;
		p[0] = th->head;
		p[0] = (unsigned long)th->head;
		th->head = p;
		th->nr += 1;
		put_cpu_var(thread_info_list);

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ ENTRY(c_backtrace)
		#define reg r5
		#define stack r6

		.Ldumpstm: stmfd sp!, {instr, reg, stack, r7, lr}
		.Ldumpstm: stmfd sp!, {instr, reg, stack, r7, r8, lr}
		mov stack, r0
		mov instr, r1
		mov reg, #9
		@@ -145,7 +145,7 @@ ENTRY(c_backtrace)
		adrne r0, .Lcr
		blne printk
		mov r0, stack
		LOADREGS(fd, sp!, {instr, reg, stack, r7, pc})
		LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc})

		.Lfp: .asciz " r%d = %08X%c"
		.Lcr: .asciz "\n"

+2 −2