ia64/xen-unstable

changeset 1965:6e4a18835d0d

bitkeeper revision 1.1108.1.39 (4107e1f4lY3QEYh9L9XnSVpW1HjOSQ)

manually merge kmalloc->xmalloc
author ach61@labyrinth.cl.cam.ac.uk
date Wed Jul 28 17:27:16 2004 +0000 (2004-07-28)
parents 57bae9faf165
children 718664f12c65
files xen/arch/x86/pdb-stub.c
line diff
     1.1 --- a/xen/arch/x86/pdb-stub.c	Wed Jul 28 17:18:40 2004 +0000
     1.2 +++ b/xen/arch/x86/pdb-stub.c	Wed Jul 28 17:27:16 2004 +0000
     1.3 @@ -312,7 +312,7 @@ pdb_process_z (int onoff, char *ptr)
     1.4  	{
     1.5  	    if (onoff == 1)
     1.6  	    {
     1.7 -	        pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) kmalloc(sizeof(pdb_bwcpoint_t));
     1.8 +	        pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) xmalloc(sizeof(pdb_bwcpoint_t));
     1.9  
    1.10  		bwc->address = addr;
    1.11  		bwc->length = pdb_x86_bkpt_length;
    1.12 @@ -350,7 +350,7 @@ pdb_process_z (int onoff, char *ptr)
    1.13  	{
    1.14  	    if (onoff == 1)
    1.15  	    {
    1.16 -	        pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) kmalloc(sizeof(pdb_bwcpoint_t));
    1.17 +	        pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) xmalloc(sizeof(pdb_bwcpoint_t));
    1.18  
    1.19  		bwc->address = addr;
    1.20  		bwc->length = length;
    1.21 @@ -734,15 +734,15 @@ pdb_process_command (char *ptr, struct p
    1.22  		    pdb_page_fault = 0;
    1.23  
    1.24  	    {
    1.25 -	        u_char *buffer = (u_char *) kmalloc (length);
    1.26 +	        u_char *buffer = (u_char *) xmalloc (length);
    1.27  		if (!buffer)
    1.28  		{
    1.29 -		    printk ("pdb error: kmalloc failure\n");
    1.30 +		    printk ("pdb error: xmalloc failure\n");
    1.31  		    break;
    1.32  		}
    1.33  		pdb_read_memory (addr, length, buffer, &pdb_ctx);
    1.34  		mem2hex (buffer, pdb_out_buffer, length); 
    1.35 -		kfree(buffer);
    1.36 +		xfree(buffer);
    1.37  	    }
    1.38  
    1.39  		    pdb_page_fault_possible = 0;
    1.40 @@ -772,15 +772,15 @@ pdb_process_command (char *ptr, struct p
    1.41  	    pdb_page_fault = 0;
    1.42  
    1.43  	    {
    1.44 -	        u_char *buffer = (u_char *) kmalloc (length);
    1.45 +	        u_char *buffer = (u_char *) xmalloc (length);
    1.46  		if (!buffer)
    1.47  		{
    1.48 -		    printk ("pdb error: kmalloc failure\n");
    1.49 +		    printk ("pdb error: xmalloc failure\n");
    1.50  		    break;
    1.51  		}
    1.52  	        hex2mem (ptr, buffer, length);
    1.53  		pdb_write_memory (addr, length, buffer, &pdb_ctx);
    1.54 -		kfree(buffer);
    1.55 +		xfree(buffer);
    1.56  	    }
    1.57  
    1.58  	    pdb_page_fault_possible = 0;