Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199529
b: refs/heads/master
c: e1cb14b
h: refs/heads/master
i:
  199527: d1ece4f
v: v3
  • Loading branch information
Denys Vlasenko authored and Michal Marek committed Mar 3, 2010
1 parent f49d7ac commit 237b011
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1360e0707090c763d0d06cbc74b04f9c9588b582
refs/heads/master: e1cb14b85f802c7717a46b1a38e1fba23ead86c3
2 changes: 1 addition & 1 deletion trunk/arch/ia64/kernel/Makefile.gate
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GATECFLAGS_gate-syms.o = -r
$(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE
$(call if_changed,gate)

# gate-data.o contains the gate DSO image as data in section .data.gate.
# gate-data.o contains the gate DSO image as data in section .data..gate.
# We must build gate.so before we can assemble it.
# Note: kbuild does not track this dependency due to usage of .incbin
$(obj)/gate-data.o: $(obj)/gate.so
2 changes: 1 addition & 1 deletion trunk/arch/ia64/kernel/gate-data.S
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.section .data.gate, "aw"
.section .data..gate, "aw"

.incbin "arch/ia64/kernel/gate.so"
4 changes: 2 additions & 2 deletions trunk/arch/ia64/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,12 @@ SECTIONS
PAGE_ALIGNED_DATA(PAGE_SIZE)
. = ALIGN(PAGE_SIZE);
__start_gate_section = .;
*(.data.gate)
*(.data..gate)
__stop_gate_section = .;
#ifdef CONFIG_XEN
. = ALIGN(PAGE_SIZE);
__xen_start_gate_section = .;
*(.data.gate.xen)
*(.data..gate.xen)
__xen_stop_gate_section = .;
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/ia64/xen/gate-data.S
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.section .data.gate.xen, "aw"
.section .data..gate.xen, "aw"

.incbin "arch/ia64/xen/gate.so"

0 comments on commit 237b011

Please sign in to comment.