Index: arch/ia32/src/boot/boot.S
===================================================================
--- arch/ia32/src/boot/boot.S	(revision de07bcf5893aee4d667e2094636cd1512e4be1d8)
+++ arch/ia32/src/boot/boot.S	(revision 203dcd45d0ab1a42c96306e965756396de8dcec4)
@@ -398,10 +398,6 @@
 	ljmpl $KTEXT,$(vesa_init_protect-vesa_init+VESA_INIT_SEGMENT<<4);
 
-vesa_init_protect:	
-.code32
-	ret;
 
 0:	#Error no Prefered mode found
-
 	mov $0x111,%cx;
 	push %di;
@@ -413,11 +409,15 @@
 	cmp $VESA_OK,%al;
 	jnz 1f;
-	jmp 2b;
+	jz 2b;    /* Force relative jump */
 
 1:mov $0x0003,%ax;
 	int $0x10;
 	mov $0xffffffff,%edi; /* EGA text mode used, because of problems with VESA */
-	jmp 8;
-
+	xor %ax,%ax
+	jz 8b;    /* Force relative jump */
+
+vesa_init_protect:	
+.code32
+	ret;
 
 vesa_idt:
Index: arch/ia64/include/mm/vhpt.h
===================================================================
--- arch/ia64/include/mm/vhpt.h	(revision de07bcf5893aee4d667e2094636cd1512e4be1d8)
+++ arch/ia64/include/mm/vhpt.h	(revision 203dcd45d0ab1a42c96306e965756396de8dcec4)
@@ -1,2 +1,31 @@
+/*
+* Copyright (C) 2006 Jakub Vana
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* - Redistributions of source code must retain the above copyright
+*   notice, this list of conditions and the following disclaimer.
+* - Redistributions in binary form must reproduce the above copyright
+*   notice, this list of conditions and the following disclaimer in the
+*   documentation and/or other materials provided with the distribution.
+* - The name of the author may not be used to endorse or promote products
+*   derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+													
+
 #ifndef __ia64_VHPT_H__
 #define __ia64_VHPT_H__
Index: arch/ia64/src/mm/vhpt.c
===================================================================
--- arch/ia64/src/mm/vhpt.c	(revision de07bcf5893aee4d667e2094636cd1512e4be1d8)
+++ arch/ia64/src/mm/vhpt.c	(revision 203dcd45d0ab1a42c96306e965756396de8dcec4)
@@ -1,2 +1,31 @@
+/*
+* Copyright (C) 2006 Jakub Vana
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* - Redistributions of source code must retain the above copyright
+*   notice, this list of conditions and the following disclaimer.
+* - Redistributions in binary form must reproduce the above copyright
+*   notice, this list of conditions and the following disclaimer in the
+*   documentation and/or other materials provided with the distribution.
+* - The name of the author may not be used to endorse or promote products
+*   derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+													
+
 #include <arch/mm/vhpt.h>
 #include <mm/frame.h>