fix conflict

wangzhengquan

2020-07-30 73c4fa813ca5dba5724b2de2102f314d52baccd6

 src/queue/mm.c

@@ -81,7 +81,7 @@
static void *place(void *bp, size_t size);
static void *find_fit(size_t size);
static void *coalesce(void *bp);
static void rm_fblock(void *bp);
static inline void rm_fblock(void *bp);
static void insert_fblock (void *bp);

static void *mem_sbrk(int incr);
@@ -444,9 +444,10 @@
/**
 * remove a block form free list
 */
static void rm_fblock(void *rbp)
static inline void rm_fblock(void *rbp)
{
  // the successor of the previous block of rbp point to next block of rbp

  PUT_PTR(SUCCRP(PREV_FBLKP(rbp)), NEXT_FBLKP(rbp));
  // the predecessor of then next block of rbp point to previous block of rbp
  PUT_PTR(PREDRP(NEXT_FBLKP(rbp)), PREV_FBLKP(rbp));