Commit Graph
3358 Commits
Author SHA1 Message Date
cl349@arcadians.cl.cam.ac.uk a3f0dc6fe0 bitkeeper revision 1.1159.212.4 (41dd3c5fTm4eCHEfEnGmThdbM-wOQg)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen-unstable.bk
2005-01-06 13:25:51 +00:00
iap10@labyrinth.cl.cam.ac.uk bfe8a79541 bitkeeper revision 1.1159.213.2 (41dc5bb8NoFeyC8xMcZdstILsQ-Tqg)
patch from Leendert van Doorn <leendert@watson.ibm.com>

Hyperthreading on VMX is broken in the xeno-unstable.bk tree. The diff
below fixes this.
It turns out that the mtrr code clears too many bits, some of them cause
Xen to crash. Being a bit more precise fixes the problem.
2005-01-05 21:27:20 +00:00
cl349@arcadians.cl.cam.ac.uk cfb3756022 bitkeeper revision 1.1159.213.1 (41dac6c7UY1XYRN99_YcfnduZgOOkA)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-unstable.bk-merge
2005-01-04 16:39:35 +00:00
cl349@arcadians.cl.cam.ac.uk c5f09a6e7e bitkeeper revision 1.1159.212.3 (41da81905Ftkk0Mw5Oh9JMpyAopNkQ)
Makefile:
  Remove extraneous text after `endif'.
2005-01-04 11:44:16 +00:00
mwilli2@equilibrium.research d3b7f999bd bitkeeper revision 1.1159.170.79 (41da0b9euJEutyxkK6O6_20FgU0cQQ)
Add help target to top level makefile.
2005-01-04 03:21:02 +00:00
kaf24@scramble.cl.cam.ac.uk f927860209 bitkeeper revision 1.1159.212.2 (41d82a12UeppHGr0P0rVzZPBqooWzQ)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2005-01-02 17:06:26 +00:00
kaf24@scramble.cl.cam.ac.uk b52f7b088b bitkeeper revision 1.1159.170.78 (41d829e8lHqACg7gEEHdWaU-Jb1YdQ)
Network driver fixes.
2005-01-02 17:05:44 +00:00
kaf24@scramble.cl.cam.ac.uk 7425efe83e bitkeeper revision 1.1159.212.1 (41d59cb5edkDeCOlUSEcFsW0oqB4mw)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
2004-12-31 18:38:45 +00:00
smh22@tempest.cl.cam.ac.uk de1f2c532c bitkeeper revision 1.1159.170.77 (41d59bfcre8NxFXZIV6T50LQhiAhYQ)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/testing/xen-2.0-testing.bk
2004-12-31 18:35:40 +00:00
smh22@tempest.cl.cam.ac.uk b0ef657c4d bitkeeper revision 1.1159.210.1 (41d59b4aOWdXjAhVW7vNOk29WN5c_w)
fix build w/ trace/debug/etc enabled [from michael day]
2004-12-31 18:32:42 +00:00
kaf24@scramble.cl.cam.ac.uk 8b313272dd bitkeeper revision 1.1159.1.525 (41d58ba8VgPwkfEiKrUXF8b7LLwQ5Q)
Andy's control-interface message switch -- first cut.
2004-12-31 17:26:00 +00:00
smh22@tempest.cl.cam.ac.uk 49310a0b33 bitkeeper revision 1.1159.1.524 (41d559dckunPc7VHcb_yXNYdk_5x7A)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk
2004-12-31 13:53:32 +00:00
smh22@tempest.cl.cam.ac.uk f222d03636 bitkeeper revision 1.1159.209.1 (41d559d4GzyJ3WvVnHx_oB2IlXZPuw)
temporary fix for BIGLOCK deadlock & tools fix
2004-12-31 13:53:24 +00:00
kaf24@scramble.cl.cam.ac.uk 31f272cb5b bitkeeper revision 1.1159.1.523 (41d54b30O4rbtOVTyJB2Od7jzSW30g)
manual merge
2004-12-31 12:50:56 +00:00
kaf24@scramble.cl.cam.ac.uk b7d997bf6b bitkeeper revision 1.1159.170.76 (41d54a7766O7ds3C9PMWbP5vuyK4Tw)
Add microcode driver to Xen.
2004-12-31 12:47:51 +00:00
kaf24@scramble.cl.cam.ac.uk d05311de76 bitkeeper revision 1.1159.1.522 (41d49c4comhlitBINhom6DG5l00gaA)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2004-12-31 00:24:44 +00:00
smh22@tempest.cl.cam.ac.uk ebc96cdfbc bitkeeper revision 1.1159.1.521 (41d46f39V5gFv-vVZKIR69j7WEZGCw)
fix typo
2004-12-30 21:12:25 +00:00
smh22@tempest.cl.cam.ac.uk 7f8bff1676 bitkeeper revision 1.1159.1.520 (41d4600d-5_Js55t1jNAOJip2i9k3Q)
build again under 2.4.
2004-12-30 20:07:41 +00:00
smh22@tempest.cl.cam.ac.uk 40ae982942 bitkeeper revision 1.1159.170.75 (41d452b0ThWwqJLrhyUjZvsHEZe3FA)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/testing/xen-2.0-testing.bk
2004-12-30 19:10:40 +00:00
smh22@tempest.cl.cam.ac.uk bb54ad6789 bitkeeper revision 1.1159.208.1 (41d4529f94LUvFd8n-okKHKIRqKcJw)
makefile fix from jared rhine
2004-12-30 19:10:23 +00:00
kaf24@scramble.cl.cam.ac.uk 0e5aa84479 bitkeeper revision 1.1159.1.519 (41d44957j43cN3y5xTzmQ9SDquPlbQ)
Fix extern declarations in VMX code. They looked okay to me, but GCC
sometimes barfed on them.
2004-12-30 18:30:47 +00:00
kaf24@scramble.cl.cam.ac.uk 7af04b80e5 bitkeeper revision 1.1159.1.518 (41d448acXfjJK8iSoExMLCtViOvsoA)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2004-12-30 18:27:56 +00:00
kaf24@scramble.cl.cam.ac.uk 49f6e16ab2 bitkeeper revision 1.1159.170.74 (41d4488f9fINTxUzyjoq2FnTn5AvMQ)
Improved memory bootstrapping takes into account e820 RAM holes.
2004-12-30 18:27:27 +00:00
smh22@tempest.cl.cam.ac.uk ac2cb8a8af bitkeeper revision 1.1159.1.517 (41d417bddbJQbGTNZdimylJpzcXpqQ)
build fixes
2004-12-30 14:59:09 +00:00
smh22@tempest.cl.cam.ac.uk 4396012597 bitkeeper revision 1.1159.1.516 (41d410d7eWGB0LUnCA0Y7EAIZig5Hg)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
2004-12-30 14:29:43 +00:00
smh22@tempest.cl.cam.ac.uk b320f85245 bitkeeper revision 1.1159.170.73 (41d410a5UNN19EUanWSnfJ52P1DlQw)
remove unused fn
2004-12-30 14:28:53 +00:00
kaf24@scramble.cl.cam.ac.uk fffa7670ef bitkeeper revision 1.1159.1.515 (41d40ea3DCBW2imJLdzfyOm_9lOoWg)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2004-12-30 14:20:19 +00:00
kaf24@scramble.cl.cam.ac.uk 0b788798d8 bitkeeper revision 1.1159.207.3 (41d40e9b3_4vSbRgi7pJ9tnNxCToeQ)
New generic I/O ring macros from Andrew Warfield and Tim Deegan.
Currently only used for block-device channels.
2004-12-30 14:20:11 +00:00
smh22@tempest.cl.cam.ac.uk ba9c800566 bitkeeper revision 1.1159.1.514 (41d40931RP9O8KEhD-URrF5kcG5Rlg)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk
2004-12-30 13:57:05 +00:00
smh22@tempest.cl.cam.ac.uk 833db2d0a6 bitkeeper revision 1.1159.1.513 (41d408a3JUgu3aO0DUVuu6Cdvk-wig)
update for 2.6 smp changes
2004-12-30 13:54:43 +00:00
kaf24@scramble.cl.cam.ac.uk 3d866e0585 bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg)
manual merge
2004-12-30 12:01:47 +00:00
kaf24@scramble.cl.cam.ac.uk a840629450 bitkeeper revision 1.1159.207.1 (41d3ed24aepggBU18HkAQtTK4p7Z9A)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2004-12-30 11:57:24 +00:00
kaf24@scramble.cl.cam.ac.uk 5b1748e026 bitkeeper revision 1.1159.170.72 (41d3eaaftC1Zqz_rl9bIUUcTSZFIjg)
Add e820 parsing to Xen. Currently not hooked into heap initialisation:
this is the next step.
2004-12-30 11:46:55 +00:00
smh22@tempest.cl.cam.ac.uk 0094f181b6 bitkeeper revision 1.1159.1.512 (41d3d11bX6np5I_hLKS7Ki18WyfK2A)
fix build (partial)
2004-12-30 09:57:47 +00:00
kaf24@scramble.cl.cam.ac.uk 38b23dd2a0 bitkeeper revision 1.1159.1.511 (41d2d24csvxPmAj9ZQPfm1CsFAsulA)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2004-12-29 15:50:36 +00:00
kaf24@scramble.cl.cam.ac.uk 43ac1bd5c3 bitkeeper revision 1.1159.170.71 (41d2d2214KOuM-HBckYg9I4kQVczaA)
Fix build.
2004-12-29 15:49:53 +00:00
kaf24@scramble.cl.cam.ac.uk 24ffba07d6 bitkeeper revision 1.1159.1.510 (41d2cc76oov-FQV58eycexLwIuSxMQ)
manual merge
2004-12-29 15:25:42 +00:00
kaf24@scramble.cl.cam.ac.uk f59d80eb15 bitkeeper revision 1.1159.1.509 (41d2caf2cGsHkns4vKFDopvGUuM4BQ)
Merge
2004-12-29 15:19:14 +00:00
kaf24@scramble.cl.cam.ac.uk 5938d3a91a bitkeeper revision 1.1159.170.70 (41d2ca6aDWrk2tn4J3lpl18fPLfjRA)
Remove heavily arch-dep bootstrap code from common/kernel.c
2004-12-29 15:16:58 +00:00
kaf24@scramble.cl.cam.ac.uk f6c136d3fa bitkeeper revision 1.1159.1.508 (41d2c334D3CtOjd6Glhc_MnA3jjEGQ)
manual merge
2004-12-29 14:46:12 +00:00
kaf24@scramble.cl.cam.ac.uk b0d400dfba bitkeeper revision 1.1159.1.507 (41d2c267giyCo6LZ_--l9fFOwkMRIQ)
manual merge
2004-12-29 14:42:47 +00:00
kaf24@scramble.cl.cam.ac.uk 0fcafc5fdb bitkeeper revision 1.1159.170.69 (41d2bdb6hidiL3KNy73HpTZ89WedqQ)
Fix NMI handler.
2004-12-29 14:22:46 +00:00
kaf24@scramble.cl.cam.ac.uk 6913eb3543 bitkeeper revision 1.1159.170.68 (41d2b498y1kgB6L3q_YXZmDzui_mSQ)
Pull command-line option declarations to files in which they are used,
rather than having a single list of them in common/kernel.c.
2004-12-29 13:43:52 +00:00
kaf24@scramble.cl.cam.ac.uk b556516ff2 bitkeeper revision 1.1159.170.67 (41d291f6BNS1b72mftsOXrpMhpZ9og)
M
2004-12-29 11:16:06 +00:00
cl349@arcadians.cl.cam.ac.uk e1db94cbd1 bitkeeper revision 1.1159.1.506 (41d00f89OifvQoN_EcnO5XuQN0RRjA)
Update to Linux 2.6.10.
2004-12-27 13:35:05 +00:00
cl349@arcadians.cl.cam.ac.uk 3ad6377723 bitkeeper revision 1.1159.1.505 (41cfdff23HZ-hiPuiX8jOHYDydBmgA)
sync w/ head.
2004-12-27 10:12:02 +00:00
cl349@arcadians.cl.cam.ac.uk c8b536e1c6 bitkeeper revision 1.1159.170.66 (41cecb32Dha6gU8G9wqOBm8UEGnLMg)
Update to Linux 2.6.10.
2004-12-26 14:31:14 +00:00
cl349@arcadians.cl.cam.ac.uk fc5e32d9d2 bitkeeper revision 1.1159.170.65 (41cec23dGYBVm5BqHogt6mEw18Mo5g)
Kconfig:
  Fix processor selection entry.
xenU_defconfig, xen0_defconfig:
  Update default configs.
2004-12-26 13:53:01 +00:00
cl349@arcadians.cl.cam.ac.uk 7ada6cd67f bitkeeper revision 1.1159.170.64 (41ce8bd3sGsiOUiBHp1KyOcLPmYBgQ)
sync w/ head.
2004-12-26 10:00:51 +00:00
iap10@labyrinth.cl.cam.ac.uk 25b590faee bitkeeper revision 1.1159.1.504 (41cc93b0yD09pgWkeLlUepCAam5oFA)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
2004-12-24 22:09:52 +00:00