litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Zach Brown <zach.brown@oracle.com>	2006-02-03 15:51:35 -0500
committer	Linus Torvalds <torvalds@g5.osdl.org>	2006-02-04 19:43:14 -0500
commit	16acc0cd8f1aac63ddf5228c5bc29cf7d31627f4 (patch)
tree	c1e6ae0b4f666a3e85b12b9280d1bff63104cf9e /arch/x86_64/kernel
parent	a1002a48e1af5ff8d02bfe79536e6fce3a0ec369 (diff)

[PATCH] x86_64: align per-cpu section to configured cache bytes

Align the start of the per-cpu section to the configured number of bytes in a cache line. This stops a BUG_ON() from triggering in load_module() when DEFINE_PER_CPU() is used in a module and the section isn't cacheline-aligned. Rusty also found this and sent a patch in a while ago (http://lkml.org/lkml/2004/10/19/17), I don't know what came of that. Signed-off-by: Zach Brown <zach.brown@oracle.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Diffstat (limited to 'arch/x86_64/kernel')

-rw-r--r--

arch/x86_64/kernel/vmlinux.lds.S

1 files changed, 1 insertions, 1 deletions


diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index b0eed1faf740..59316d1c1d84 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -173,7 +173,7 @@ SECTIONS
173	__initramfs_start = .;	173	__initramfs_start = .;
174	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) }	174	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) }
175	__initramfs_end = .;	175	__initramfs_end = .;
176	. = ALIGN(32);	176	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
177	__per_cpu_start = .;	177	__per_cpu_start = .;
178	.data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) }	178	.data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) }
179	__per_cpu_end = .;	179	__per_cpu_end = .;

/* SCTP kernel implementation Copyright (C) 1999-2001 * Cisco, Motorola, and IBM * Copyright 2001 La Monte H.P. Yarroll * * This file is part of the SCTP kernel implementation * * These functions manipulate sctp command sequences. * * This SCTP implementation is free software; * you can redistribute it and/or modify it under the terms of * the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This SCTP implementation is distributed in the hope that it * will be useful, but WITHOUT ANY WARRANTY; without even the implied * ************************ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with GNU CC; see the file COPYING. If not, write to * the Free Software Foundation, 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * * Please send any bug reports or fixes you make to the * email address(es): * lksctp developers <lksctp-developers@lists.sourceforge.net> * * Or submit a bug report through the following website: * http://www.sf.net/projects/lksctp * * Written or modified by: * La Monte H.P. Yarroll <piggy@acm.org> * Karl Knutson <karl@athena.chicago.il.us> * * Any bugs reported given to us we will try to fix... any fixes shared will * be incorporated into the next SCTP release. */ #include <linux/types.h> #include <net/sctp/sctp.h> #include <net/sctp/sm.h> /* Initialize a block of memory as a command sequence. */ int sctp_init_cmd_seq(sctp_cmd_seq_t *seq) { memset(seq, 0, sizeof(sctp_cmd_seq_t)); return 1; /* We always succeed. */ } /* Add a command to a sctp_cmd_seq_t. * Return 0 if the command sequence is full. */ void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj) { BUG_ON(seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS); seq->cmds[seq->next_free_slot].verb = verb; seq->cmds[seq->next_free_slot++].obj = obj; } /* Return the next command structure in a sctp_cmd_seq. * Returns NULL at the end of the sequence. */ sctp_cmd_t *sctp_next_cmd(sctp_cmd_seq_t *seq) { sctp_cmd_t *retval = NULL; if (seq->next_cmd < seq->next_free_slot) retval = &seq->cmds[seq->next_cmd++]; return retval; }


context:
space:
mode: