summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-08-25 23:42:02 +0000
committerpeter <peter@FreeBSD.org>1999-08-25 23:42:02 +0000
commit8858fe3aec80a2fea01d4467b88d26252e9265e9 (patch)
tree8f2a7d7a90a56b18f90afd93e124f820e384bd55
parent8cce2a845a330bbd56ed957ce5d47f73e4fdeccb (diff)
downloadFreeBSD-src-8858fe3aec80a2fea01d4467b88d26252e9265e9.zip
FreeBSD-src-8858fe3aec80a2fea01d4467b88d26252e9265e9.tar.gz
It would help if things that MUST be 32 bit aligned were really 32 bit
aligned. If I recall correctly, this is to ensure apic_imen can be accessed in a single bus cycle. Also, use TEXT_ALIGN rather than a .align 2 (which means 2 byte align on ELF and 4 byte align on a.out)
-rw-r--r--sys/i386/isa/apic_ipl.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s
index 4ba7df1..57ddeca 100644
--- a/sys/i386/isa/apic_ipl.s
+++ b/sys/i386/isa/apic_ipl.s
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: apic_ipl.s,v 1.24 1999/07/03 06:33:47 alc Exp $
+ * $Id: apic_ipl.s,v 1.25 1999/07/10 15:27:58 bde Exp $
*/
@@ -65,7 +65,7 @@ _vec:
* MAYBE_UNMASK_IRQ
* imen_dump()
*/
- .align 2 /* MUST be 32bit aligned */
+ .p2align 2 /* MUST be 32bit aligned */
.globl _apic_imen
_apic_imen:
.long HWI_MASK
@@ -308,7 +308,7 @@ ENTRY(INTRDIS)
#define _APIC 12(%esp)
#define _MASK 16(%esp)
- .align 2
+ ALIGN_TEXT
write_ioapic_mask:
pushl %ebx /* scratch */
pushl %esi /* scratch */
OpenPOWER on IntegriCloud